fix(ads): Expanded conditional to start media after Ad has been playe…

…d if there is no `seekable` info; added missing event for HLS media
openplayerjs · Oct 4, 2018 · 918aaa8 · 918aaa8
1 parent c477d18
commit 918aaa8
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 5 deletions.
diff --git a/dist/openplayer.js b/dist/openplayer.js
@@ -6654,6 +6654,8 @@ var HlsMedia = function (_native_1$default) {
       this.player.detachMedia();
       this.player.loadSource(this.media.src);
       this.player.attachMedia(this.element);
+      var e = events_1.addEvent('loadedmetadata');
+      this.element.dispatchEvent(e);
 
       if (!this.events) {
         this.events = Hls.Events;
@@ -7306,8 +7308,8 @@ var Ads = function () {
   }, {
     key: "_loadedMetadataHandler",
     value: function _loadedMetadataHandler() {
-      if (this.element.seekable.length) {
-        if (this.element.seekable.end(0) > this.lastTimePaused) {
+      if (this.media.currentTime === 0 || this.element.seekable.length) {
+        if (this.media.currentTime === 0 || this.element.seekable.end(0) > this.lastTimePaused) {
           this.media.currentTime = this.lastTimePaused;
           this.element.controls = !!(constants_1.IS_IPHONE && general_1.isVideo(this.element));
           this.element.removeEventListener('loadedmetadata', this._loadedMetadataHandler.bind(this));

diff --git a/dist/openplayer.min.js b/dist/openplayer.min.js
diff --git a/src/js/media/ads.ts b/src/js/media/ads.ts
@@ -837,8 +837,8 @@ class Ads {
      * @memberof Ads
      */
     private _loadedMetadataHandler() {
-        if (this.element.seekable.length) {
-            if (this.element.seekable.end(0) > this.lastTimePaused) {
+        if (this.media.currentTime === 0 || this.element.seekable.length) {
+            if (this.media.currentTime === 0 || this.element.seekable.end(0) > this.lastTimePaused) {
                 this.media.currentTime = this.lastTimePaused;
                 this.element.controls = !!(IS_IPHONE && isVideo(this.element));
                 this.element.removeEventListener('loadedmetadata', this._loadedMetadataHandler.bind(this));

diff --git a/src/js/media/hls.ts b/src/js/media/hls.ts
@@ -110,6 +110,9 @@ class HlsMedia extends Native {
         this.player.loadSource(this.media.src);
         this.player.attachMedia(this.element);
 
+        const e = addEvent('loadedmetadata');
+        this.element.dispatchEvent(e);
+
         if (!this.events) {
             this.events = Hls.Events;
             Object.keys(this.events).forEach(event => {