Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update ALL imports of PropTypes #37

Merged
merged 1 commit into from
Jul 29, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion example/AudioPlayer.jsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import React, { Component, PropTypes } from 'react'
import React, { Component } from 'react'
import ReactDOM, { findDOMNode } from 'react-dom'
import PropTypes from 'prop-types'
import { Media, Player, controls, utils } from '../src/react-media-player'
import PlayPause from './PlayPause'
import MuteUnmute from './MuteUnmute'
Expand Down
3 changes: 2 additions & 1 deletion example/CirclePlayer.jsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React, { Component, PropTypes } from 'react'
import React, { Component } from 'react'
import PropTypes from 'prop-types'
import CircleProgress from './CircleProgress'
import { Media, Player } from '../src/react-media-player'

Expand Down
3 changes: 2 additions & 1 deletion example/Fullscreen.jsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React, { Component, PropTypes } from 'react'
import React, { Component } from 'react'
import PropTypes from 'prop-types'
import { withMediaProps } from '../src/react-media-player'

class Fullscreen extends Component {
Expand Down
3 changes: 2 additions & 1 deletion example/MediaPlayer.jsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React, { Component, PropTypes } from 'react'
import React, { Component } from 'react'
import PropTypes from 'prop-types'
import { Media, Player, controls, utils } from '../src/react-media-player'
import PlayPause from './PlayPause'
import MuteUnmute from './MuteUnmute'
Expand Down
3 changes: 2 additions & 1 deletion example/MuteUnmute.jsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React, { Component, PropTypes } from 'react'
import React, { Component } from 'react'
import PropTypes from 'prop-types'
import { withMediaProps } from '../src/react-media-player'
import Transition from 'react-motion-ui-pack'

Expand Down
3 changes: 2 additions & 1 deletion example/PlayPause.jsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React, { Component, PropTypes } from 'react'
import React, { Component } from 'react'
import PropTypes from 'prop-types'
import { withMediaProps } from '../src/react-media-player'
import Transition from 'react-motion-ui-pack'

Expand Down
3 changes: 2 additions & 1 deletion example/Repeat.jsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React, { Component, PropTypes } from 'react'
import React, { Component } from 'react'
import PropTypes from 'prop-types'

class Repeat extends Component {
render() {
Expand Down
3 changes: 2 additions & 1 deletion example/VideoPlayer.jsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React, { Component, PropTypes } from 'react'
import React, { Component } from 'react'
import PropTypes from 'prop-types'
import { Media, Player, withMediaProps, withKeyboardControls, controls } from '../src/react-media-player'
import PlayPause from './PlayPause'
import MuteUnmute from './MuteUnmute'
Expand Down
3 changes: 2 additions & 1 deletion example/index.jsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import React, { Component, PropTypes, createElement } from 'react'
import React, { Component, createElement } from 'react'
import ReactDOM from 'react-dom'
import PropTypes from 'prop-types'
import MediaPlayer from './MediaPlayer'
import VideoPlayer from './VideoPlayer'
import AudioPlayer from './AudioPlayer'
Expand Down
5 changes: 4 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,10 @@
"version": "0.6.2",
"description": "React media player.",
"main": "lib/react-media-player.js",
"files": ["dist", "lib"],
"files": [
"dist",
"lib"
],
"scripts": {
"build:lib": "babel src --out-dir lib",
"build": "npm run build:lib && NODE_ENV=production webpack --config webpack.prod.config.js",
Expand Down
3 changes: 2 additions & 1 deletion src/Media.jsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React, { Component, PropTypes, Children } from 'react'
import React, { Component, Children } from 'react'
import PropTypes from 'prop-types';
import ReactDOM, { findDOMNode } from 'react-dom'
import contextTypes from './context-types'
import requestFullscreen from './utils/request-fullscreen'
Expand Down
3 changes: 2 additions & 1 deletion src/Player.jsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React, { Component, PropTypes, createElement } from 'react'
import React, { Component, createElement } from 'react'
import PropTypes from 'prop-types'
import contextTypes from './context-types'
import getVendor from './utils/get-vendor'

Expand Down
3 changes: 2 additions & 1 deletion src/controls/CurrentTime.jsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React, { Component, PropTypes } from 'react'
import React, { Component } from 'react'
import PropTypes from 'prop-types'
import withMediaProps from '../decorators/with-media-props'
import formatTime from '../utils/format-time'

Expand Down
3 changes: 2 additions & 1 deletion src/controls/Duration.jsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React, { Component, PropTypes } from 'react'
import React, { Component } from 'react'
import PropTypes from 'prop-types'
import withMediaProps from '../decorators/with-media-props'
import formatTime from '../utils/format-time'

Expand Down
3 changes: 2 additions & 1 deletion src/controls/Fullscreen.jsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React, { Component, PropTypes } from 'react'
import React, { Component } from 'react'
import PropTypes from 'prop-types'
import withMediaProps from '../decorators/with-media-props'

class Fullscreen extends Component {
Expand Down
3 changes: 2 additions & 1 deletion src/controls/MuteUnmute.jsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React, { Component, PropTypes } from 'react'
import React, { Component } from 'react'
import PropTypes from 'prop-types'
import withMediaProps from '../decorators/with-media-props'

class MuteUnmute extends Component {
Expand Down
3 changes: 2 additions & 1 deletion src/controls/PlayPause.jsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React, { Component, PropTypes } from 'react'
import React, { Component } from 'react'
import PropTypes from 'prop-types'
import withMediaProps from '../decorators/with-media-props'

class PlayPause extends Component {
Expand Down
3 changes: 2 additions & 1 deletion src/controls/Progress.jsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React, { Component, PropTypes } from 'react'
import React, { Component } from 'react'
import PropTypes from 'prop-types'
import withMediaProps from '../decorators/with-media-props'

class Progress extends Component {
Expand Down
3 changes: 2 additions & 1 deletion src/controls/SeekBar.jsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React, { Component, PropTypes } from 'react'
import React, { Component } from 'react'
import PropTypes from 'prop-types'
import withMediaProps from '../decorators/with-media-props'

class SeekBar extends Component {
Expand Down
3 changes: 2 additions & 1 deletion src/controls/Volume.jsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React, { Component, PropTypes } from 'react'
import React, { Component } from 'react'
import PropTypes from 'prop-types'
import withMediaProps from '../decorators/with-media-props'

class Volume extends Component {
Expand Down
3 changes: 2 additions & 1 deletion src/vendors/HTML5.jsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React, { Component, PropTypes, createElement } from 'react'
import React, { Component, createElement } from 'react'
import PropTypes from 'prop-types'
import { findDOMNode } from 'react-dom'
import vendorPropTypes from './vendor-prop-types'

Expand Down