fix(player): Fixed error when running tests on Travis

openplayerjs · Feb 4, 2019 · aaee1ea · aaee1ea
1 parent 6f6dfc9
commit aaee1ea
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 23 deletions.
diff --git a/dist/openplayer.js b/dist/openplayer.js
@@ -5888,15 +5888,17 @@ var Settings = function () {
       this.hideEvent = function () {
         var timeout;
 
-        if (timeout) {
+        if (timeout && typeof window !== 'undefined') {
           window.cancelAnimationFrame(timeout);
         }
 
-        timeout = window.requestAnimationFrame(function () {
-          _this.menu.innerHTML = _this.originalOutput;
+        if (typeof window !== 'undefined') {
+          timeout = window.requestAnimationFrame(function () {
+            _this.menu.innerHTML = _this.originalOutput;
 
-          _this.menu.setAttribute('aria-hidden', 'true');
-        });
+            _this.menu.setAttribute('aria-hidden', 'true');
+          });
+        }
       };
 
       this.removeEvent = function (e) {
@@ -7388,13 +7390,15 @@ var Ads = function () {
         var mode = target.getAttribute('data-fullscreen') === 'true' ? google.ima.ViewMode.FULLSCREEN : google.ima.ViewMode.NORMAL;
         var timeout;
 
-        if (timeout) {
+        if (timeout && typeof window !== 'undefined') {
           window.cancelAnimationFrame(timeout);
         }
 
-        timeout = window.requestAnimationFrame(function () {
-          _this2.adsManager.resize(width && height ? width : target.offsetWidth, width && height ? height : target.offsetHeight, mode);
-        });
+        if (typeof window !== 'undefined') {
+          timeout = window.requestAnimationFrame(function () {
+            _this2.adsManager.resize(width && height ? width : target.offsetWidth, width && height ? height : target.offsetHeight, mode);
+          });
+        }
       }
     }
   }, {

diff --git a/dist/openplayer.min.js b/dist/openplayer.min.js
diff --git a/src/js/controls/settings.ts b/src/js/controls/settings.ts
@@ -153,14 +153,16 @@ class Settings implements PlayerComponent {
 
         this.hideEvent = () => {
             let timeout;
-            if (timeout) {
+            if (timeout && typeof window !== 'undefined') {
                 window.cancelAnimationFrame(timeout);
             }
 
-            timeout = window.requestAnimationFrame(() => {
-                this.menu.innerHTML = this.originalOutput;
-                this.menu.setAttribute('aria-hidden', 'true');
-            });
+            if (typeof window !== 'undefined') {
+                timeout = window.requestAnimationFrame(() => {
+                    this.menu.innerHTML = this.originalOutput;
+                    this.menu.setAttribute('aria-hidden', 'true');
+                });
+            }
         };
 
         this.removeEvent = (e: CustomEvent) => {

diff --git a/src/js/media/ads.ts b/src/js/media/ads.ts
@@ -438,16 +438,18 @@ class Ads {
 
             let timeout;
 
-            if (timeout) {
+            if (timeout && typeof window !== 'undefined') {
                 window.cancelAnimationFrame(timeout);
             }
-            timeout = window.requestAnimationFrame(() => {
-                this.adsManager.resize(
-                    width && height ? width : target.offsetWidth,
-                    width && height ? height : target.offsetHeight,
-                    mode,
-                );
-            });
+            if (typeof window !== 'undefined') {
+                timeout = window.requestAnimationFrame(() => {
+                    this.adsManager.resize(
+                        width && height ? width : target.offsetWidth,
+                        width && height ? height : target.offsetHeight,
+                        mode,
+                    );
+                });
+            }
         }
     }