fix(ads): Fixed workflow when dealing with a list of Ads URLs; remove…

…d unnecessary workflow to end media when Ad is completed
openplayerjs · Feb 15, 2020 · 66dddea · 66dddea
1 parent d89f4a5
commit 66dddea
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 32 deletions.
diff --git a/demo/demo.js b/demo/demo.js
@@ -7,7 +7,7 @@
     var instances = [];
 
     for (var i = 0, total = players.length; i < total; i++) {
-        var ads = i === 0 ? [players[i].getAttribute('data-op-ads'),] : null;
+        var ads = i === 0 ? players[i].getAttribute('data-op-ads') : null;
         instances[i] = new OpenPlayer(players[i].id, ads, false, {
             ads: {
                 debug: false,

diff --git a/dist/openplayer.js b/dist/openplayer.js
@@ -8479,12 +8479,6 @@ var Ads = function () {
             this.element.parentElement.classList.remove('op-ads--active');
             this.adsActive = false;
             clearInterval(this.intervalTimer);
-
-            if (this.element.currentTime >= this.element.duration) {
-              this.destroy();
-              var endedEvent = events_1.addEvent('ended');
-              this.element.dispatchEvent(endedEvent);
-            }
           }
 
           break;
@@ -8506,9 +8500,8 @@ var Ads = function () {
             this.destroy();
 
             if (this.element.currentTime >= this.element.duration) {
-              var _endedEvent = events_1.addEvent('ended');
-
-              this.element.dispatchEvent(_endedEvent);
+              var endedEvent = events_1.addEvent('ended');
+              this.element.dispatchEvent(endedEvent);
             }
           }
 
@@ -8657,15 +8650,20 @@ var Ads = function () {
   }, {
     key: "_loadedMetadataHandler",
     value: function _loadedMetadataHandler() {
-      if (Array.isArray(this.ads) && this.currentAdsIndex <= this.ads.length - 1) {
-        this.adsManager.destroy();
-        this.adsLoader.contentComplete();
+      if (Array.isArray(this.ads)) {
         this.currentAdsIndex++;
-        this.playTriggered = true;
-        this.adsStarted = true;
-        this.adsDone = false;
 
-        this._requestAds();
+        if (this.currentAdsIndex <= this.ads.length - 1) {
+          this.adsManager.destroy();
+          this.adsLoader.contentComplete();
+          this.playTriggered = true;
+          this.adsStarted = true;
+          this.adsDone = false;
+
+          this._requestAds();
+        } else {
+          this._prepareMedia();
+        }
       } else if (this.element.seekable.length) {
         if (this.element.seekable.end(0) > this.lastTimePaused) {
           this._prepareMedia();

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
@@ -628,11 +628,6 @@ class Ads {
                     this.element.parentElement.classList.remove('op-ads--active');
                     this.adsActive = false;
                     clearInterval(this.intervalTimer);
-                    if (this.element.currentTime >= this.element.duration) {
-                        this.destroy();
-                        const endedEvent = addEvent('ended');
-                        this.element.dispatchEvent(endedEvent);
-                    }
                 }
                 break;
             case google.ima.AdEvent.Type.VOLUME_CHANGED:
@@ -681,6 +676,7 @@ class Ads {
         };
         const errorEvent = addEvent('playererror', details);
         this.element.dispatchEvent(errorEvent);
+
         if (Array.isArray(this.ads) && this.ads.length > 1 && this.currentAdsIndex <= this.ads.length - 1) {
             if (this.currentAdsIndex < this.ads.length - 1) {
                 this.currentAdsIndex++;
@@ -852,14 +848,18 @@ class Ads {
      * @memberof Ads
      */
     private _loadedMetadataHandler() {
-        if (Array.isArray(this.ads) && this.currentAdsIndex <= this.ads.length - 1) {
-            this.adsManager.destroy();
-            this.adsLoader.contentComplete();
+        if (Array.isArray(this.ads)) {
             this.currentAdsIndex++;
-            this.playTriggered = true;
-            this.adsStarted = true;
-            this.adsDone = false;
-            this._requestAds();
+            if (this.currentAdsIndex <= this.ads.length - 1) {
+                this.adsManager.destroy();
+                this.adsLoader.contentComplete();
+                this.playTriggered = true;
+                this.adsStarted = true;
+                this.adsDone = false;
+                this._requestAds();
+            } else {
+                this._prepareMedia();
+            }
         } else if (this.element.seekable.length) {
             if (this.element.seekable.end(0) > this.lastTimePaused) {
                 this._prepareMedia();
@@ -889,14 +889,16 @@ class Ads {
         };
 
         const waitPromise = (ms: number, isReject: boolean) => new Promise((resolve, reject) => {
-            if (isReject) { return reject(); }
+            if (isReject) {
+                return reject();
+            }
 
             setTimeout(resolve, ms);
         });
 
         waitPromise(50, this.media.ended)
             .then(() => this.media.play().then(() => triggerEvent('play'))
-                .catch(() => triggerEvent('ended')));
+            .catch(() => triggerEvent('ended')));
 
     }