Replay 1f18bdb due to incorrect merge conflict resolution in 94ff7b3

h5p · May 25, 2018 · 9d612b7 · 9d612b7
1 parent e1af0c1
commit 9d612b7
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 13 deletions.
diff --git a/scripts/html5.js b/scripts/html5.js
@@ -188,13 +188,7 @@ H5P.VideoHtml5 = (function ($) {
             }
 
             if (arg === H5P.Video.PLAYING) {
-              if (self.seeking === true) {
-                extraArg = self.videoXAPI.getArgsXAPISeeked(self.seekedTo);
-                extraTrigger = 'seeked';
-                lastSend = 'seeked';
-                self.seeking = false;
-              }
-              else if (lastSend !== 'play') {
+              if (lastSend !== 'play') {
                 extraArg = self.videoXAPI.getArgsXAPIPlayed(video.currentTime);
                 extraTrigger = 'play';
                 lastSend = 'play';
@@ -203,7 +197,7 @@ H5P.VideoHtml5 = (function ($) {
 
             if (arg === H5P.Video.PAUSED) {
               // Put together extraArg for sending to xAPI statement.
-              if (!video.seeking && self.seeking === false && video.currentTime !== video.duration) {
+              if (!video.seeking && self.seeking === false && video.currentTime !== video.duration && self.previousState !== H5P.Video.BUFFERING) {
                 extraTrigger = 'paused';
                 extraArg = self.videoXAPI.getArgsXAPIPaused(video.currentTime, video.duration);
                 lastSend = 'paused';
@@ -300,6 +294,7 @@ H5P.VideoHtml5 = (function ($) {
             arg = self.getPlaybackRate();
             break;
         }
+        self.previousState = arg;
         self.trigger(h5p, arg);
 
         // Make extra calls for events with needed values for xAPI statement.

diff --git a/scripts/youtube.js b/scripts/youtube.js
@@ -123,14 +123,10 @@ H5P.VideoYouTube = (function ($) {
                 if (self.seeking === false) {
                   self.trigger('play', self.videoXAPI.getArgsXAPIPlayed(player.getCurrentTime()));
                 }
-                else {
-                  self.trigger('seeked', self.videoXAPI.getArgsXAPISeeked(self.seekedTo));
-                  self.seeking = false;
-                }
               }
               else if (state.data === 2) {
                 // This is a paused event.
-                if (self.seeking === false) {
+                if (self.seeking === false && self.previousState !== 3) {
                   self.trigger('paused', self.videoXAPI.getArgsXAPIPaused(player.getCurrentTime(), self.duration));
                 }
               }
@@ -147,6 +143,7 @@ H5P.VideoYouTube = (function ($) {
                 }
               }
             }
+            self.previousState = state.data;
           },
           onPlaybackQualityChange: function (quality) {
             self.trigger('qualityChange', quality.data);