Use explicit isReady property to guard player methods

Fixes cookpete/react-player#18
webmiraclepro · Dec 27, 2015 · 976e3ed · 976e3ed
1 parent 7ac7952
commit 976e3ed
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 17 deletions.
diff --git a/src/players/Base.js b/src/players/Base.js
@@ -32,10 +32,12 @@ export default class Base extends Component {
   shouldComponentUpdate (nextProps) {
     return this.props.url !== nextProps.url
   }
+  isReady = false
   onReady = () => {
     this.setVolume(this.props.volume)
     if (this.props.playing || this.preloading) {
       this.preloading = false
+      this.isReady = true
       this.play()
     }
   }

diff --git a/src/players/FilePlayer.js b/src/players/FilePlayer.js
@@ -37,11 +37,11 @@ export default class FilePlayer extends Base {
     this.player.volume = fraction
   }
   getFractionPlayed () {
-    if (this.player.readyState === 0) return 0
+    if (!this.isReady) return 0
     return this.player.currentTime / this.player.duration
   }
   getFractionLoaded () {
-    if (this.player.readyState === 0) return 0
+    if (!this.isReady) return 0
     return this.player.buffered.end(0) / this.player.duration
   }
   render () {

diff --git a/src/players/SoundCloud.js b/src/players/SoundCloud.js
@@ -74,31 +74,31 @@ export default class SoundCloud extends Base {
     ondataerror: this.props.onError
   }
   play () {
-    if (!this.player) return
+    if (!this.isReady) return
     this.player.play()
   }
   pause () {
-    if (!this.player) return
+    if (!this.isReady) return
     this.player.pause()
   }
   stop () {
-    if (!this.player) return
+    if (!this.isReady) return
     this.player.stop()
   }
   seekTo (fraction) {
-    if (!this.player) return
+    if (!this.isReady) return
     this.player.seek(this.player.getDuration() * fraction)
   }
   setVolume (fraction) {
-    if (!this.player) return
+    if (!this.isReady) return
     this.player.setVolume(fraction)
   }
   getFractionPlayed () {
-    if (!this.player) return 0
+    if (!this.isReady) return 0
     return this.player.getCurrentPosition() / this.player.getDuration()
   }
   getFractionLoaded () {
-    if (!this.player) return 0
+    if (!this.isReady) return 0
     return this.player.getLoadedPosition() / this.player.getDuration()
   }
   render () {

diff --git a/src/players/YouTube.js b/src/players/YouTube.js
@@ -46,7 +46,7 @@ export default class YouTube extends Base {
   }
   load (url, playing) {
     const id = url && url.match(MATCH_URL)[1]
-    if (this.player) {
+    if (this.isReady) {
       this.stop()
       if (playing) {
         this.player.loadVideoById(id)
@@ -77,31 +77,31 @@ export default class YouTube extends Base {
     if (state.data === YT.PlayerState.ENDED) this.props.onEnded()
   }
   play () {
-    if (!this.player) return
+    if (!this.isReady) return
     this.player.playVideo()
   }
   pause () {
-    if (!this.player) return
+    if (!this.isReady) return
     this.player.pauseVideo()
   }
   stop () {
-    if (!this.player) return
+    if (!this.isReady) return
     this.player.stopVideo()
   }
   seekTo (fraction) {
-    if (!this.player) return
+    if (!this.isReady) return
     this.player.seekTo(this.player.getDuration() * fraction)
   }
   setVolume (fraction) {
-    if (!this.player) return
+    if (!this.isReady) return
     this.player.setVolume(fraction * 100)
   }
   getFractionPlayed () {
-    if (!this.player || !this.player.getCurrentTime) return 0
+    if (!this.isReady) return 0
     return this.player.getCurrentTime() / this.player.getDuration()
   }
   getFractionLoaded () {
-    if (!this.player || !this.player.getVideoLoadedFraction) return 0
+    if (!this.isReady) return 0
     return this.player.getVideoLoadedFraction()
   }
   render () {