playing and play events shouldn't be triggered while buffering or see…

…king, avoid throwing and breaking the player when it is destroyed faster than expected
goodvidio · Apr 24, 2017 · 7c460fe · 7c460fe
1 parent 893a92c
commit 7c460fe
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 9 deletions.
diff --git a/dist/Youtube.js b/dist/Youtube.js
@@ -64,8 +64,14 @@ THE SOFTWARE. */
     dispose: function() {
       if (this.ytPlayer) {
         //Dispose of the YouTube Player
-        this.ytPlayer.stopVideo();
-        this.ytPlayer.destroy();
+        try {
+            this.ytPlayer.stopVideo();
+            this.ytPlayer.destroy();
+        } catch (e) {
+          if (e.message !== 'this.ytPlayer.stopVideo is not a function') {
+            console.log(e);
+          }
+        }
       } else {
         //YouTube API hasn't finished loading or the player is already disposed
         var index = Youtube.apiReadyQueue.indexOf(this);
@@ -284,12 +290,15 @@ THE SOFTWARE. */
         case YT.PlayerState.PLAYING:
           this.trigger('timeupdate');
           this.trigger('durationchange');
-          this.trigger('playing');
-          this.trigger('play');
 
           if (this.isSeeking) {
             this.onSeeked();
           }
+
+          if (!this.isSeeking && state !== YT.PlayerState.BUFFERING) {
+            this.trigger('playing');
+            this.trigger('play');
+          }
           break;
 
         case YT.PlayerState.PAUSED: