fix(ads): Dispatched new event to show loading state on ads; fixed di…

…mensions on Ad when starting to play; fixed typo in waiting event
openplayerjs · Nov 13, 2018 · e16c6a1 · e16c6a1
1 parent 4b8a0d3
commit e16c6a1
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 7 deletions.
diff --git a/dist/openplayer.js b/dist/openplayer.js
@@ -1672,7 +1672,7 @@ var Player = function () {
         this.events.waiting = function () {
           _this3.playBtn.setAttribute('aria-hidden', 'true');
 
-          _this3.loader.setAttribute('aria-hidden', 'true');
+          _this3.loader.setAttribute('aria-hidden', 'false');
         };
 
         this.events.seeking = function () {
@@ -7333,10 +7333,11 @@ var Ads = function () {
             this.adsCurrentTime = ad.getDuration();
 
             if (!this.mediaStarted) {
+              var waitingEvent = events_1.addEvent('waiting');
+              this.element.dispatchEvent(waitingEvent);
               var loadedEvent = events_1.addEvent('loadedmetadata');
               this.element.dispatchEvent(loadedEvent);
-              var resizeEvent = events_1.addEvent('resize');
-              window.dispatchEvent(resizeEvent);
+              this.resizeAds();
               this.mediaStarted = true;
             }
           }
@@ -7348,6 +7349,12 @@ var Ads = function () {
             this.adsActive = true;
             var playEvent = events_1.addEvent('play');
             this.element.dispatchEvent(playEvent);
+            var resized;
+
+            if (!resized) {
+              this.resizeAds();
+              resized = true;
+            }
 
             if (this.media.ended) {
               this.adsEnded = false;

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
@@ -630,11 +630,13 @@ class Ads {
                     this.adsDuration = ad.getDuration();
                     this.adsCurrentTime = ad.getDuration();
                     if (!this.mediaStarted) {
+                        const waitingEvent = addEvent('waiting');
+                        this.element.dispatchEvent(waitingEvent);
+
                         const loadedEvent = addEvent('loadedmetadata');
                         this.element.dispatchEvent(loadedEvent);
 
-                        const resizeEvent = addEvent('resize');
-                        window.dispatchEvent(resizeEvent);
+                        this.resizeAds();
                         this.mediaStarted = true;
                     }
                 }
@@ -644,6 +646,12 @@ class Ads {
                     this.adsActive = true;
                     const playEvent = addEvent('play');
                     this.element.dispatchEvent(playEvent);
+                    let resized;
+
+                    if (!resized) {
+                        this.resizeAds();
+                        resized = true;
+                    }
 
                     if (this.media.ended) {
                         this.adsEnded = false;

diff --git a/src/js/player.ts b/src/js/player.ts
@@ -698,7 +698,7 @@ class Player {
             };
             this.events.waiting = () => {
                 this.playBtn.setAttribute('aria-hidden', 'true');
-                this.loader.setAttribute('aria-hidden', 'true');
+                this.loader.setAttribute('aria-hidden', 'false');
             };
             this.events.seeking = () => {
                 const el = this.activeElement();