fix(player): Added missing conditionals to avoid hiding controls when…

… paused and on regular media; fixed typo on stylesheet
openplayerjs · Apr 4, 2019 · 3e68e7c · 3e68e7c
1 parent 88c96c4
commit 3e68e7c
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 14 deletions.
diff --git a/dist/openplayer.css b/dist/openplayer.css
@@ -473,7 +473,7 @@
     background: transparent;
 }
 .op-controls input[type='range']::-ms-ticks-before,
-.op-controls input[type='range']::-ms-ticks-after, {
+.op-controls input[type='range']::-ms-ticks-after {
     display: none !important;
 }
 .op-controls--hidden .op-controls .op-controls__progress--seek::-webkit-slider-thumb {

diff --git a/dist/openplayer.js b/dist/openplayer.js
@@ -1789,7 +1789,7 @@ var Player = function () {
 
           _this3.playBtn.classList.remove('op-player__play--paused');
 
-          _this3.playBtn.setAttribute('aria-hidden', constants_1.IS_ANDROID || constants_1.IS_IOS ? 'false' : 'true');
+          _this3.playBtn.setAttribute('aria-hidden', 'false');
 
           _this3.playBtn.title = _this3.options.labels.play;
         };
@@ -4156,7 +4156,7 @@ return deepmerge_1;
 /* 121 */
 /***/ (function(module, exports) {
 
-!function(e){var t=e.Element.prototype;"function"!=typeof t.matches&&(t.matches=t.msMatchesSelector||t.mozMatchesSelector||t.webkitMatchesSelector||function(e){for(var t=(o.document||o.ownerDocument).querySelectorAll(e),o=this,n=0;t[n]&&t[n]!==o;)++n;return Boolean(t[n])}),"function"!=typeof t.closest&&(t.closest=function(e){for(var t=this;t&&1===t.nodeType;){if(t.matches(e))return t;t=t.parentNode}return null})}(window);
+!function(e){var t=e.Element.prototype;"function"!=typeof t.matches&&(t.matches=t.msMatchesSelector||t.mozMatchesSelector||t.webkitMatchesSelector||function(e){for(var t=(this.document||this.ownerDocument).querySelectorAll(e),o=0;t[o]&&t[o]!==this;)++o;return Boolean(t[o])}),"function"!=typeof t.closest&&(t.closest=function(e){for(var t=this;t&&1===t.nodeType;){if(t.matches(e))return t;t=t.parentNode}return null})}(window);
 
 
 /***/ }),
@@ -4257,7 +4257,7 @@ var Controls = function () {
 
       if (!constants_1.IS_ANDROID && !constants_1.IS_IOS) {
         this.events.mouse.mouseenter = function () {
-          if (isMediaVideo) {
+          if (isMediaVideo && _this.player.isMedia() && !_this.player.activeElement().paused) {
             _this._stopControlTimer();
 
             _this.player.playBtn.setAttribute('aria-hidden', 'false');
@@ -4269,7 +4269,7 @@ var Controls = function () {
         };
 
         this.events.mouse.mousemove = function () {
-          if (isMediaVideo) {
+          if (isMediaVideo && _this.player.isMedia() && !_this.player.activeElement().paused) {
             _this.player.playBtn.setAttribute('aria-hidden', 'false');
 
             _this.player.getContainer().classList.remove('op-controls--hidden');
@@ -4279,7 +4279,7 @@ var Controls = function () {
         };
 
         this.events.mouse.mouseleave = function () {
-          if (isMediaVideo) {
+          if (isMediaVideo && _this.player.isMedia() && !_this.player.activeElement().paused) {
             _this._startControlTimer(1000);
           }
         };

diff --git a/dist/openplayer.min.css b/dist/openplayer.min.css
diff --git a/dist/openplayer.min.js b/dist/openplayer.min.js
diff --git a/package-lock.json b/package-lock.json
diff --git a/src/css/player.css b/src/css/player.css
@@ -421,7 +421,7 @@
     background: transparent;
 }
 .op-controls input[type='range']::-ms-ticks-before,
-.op-controls input[type='range']::-ms-ticks-after, {
+.op-controls input[type='range']::-ms-ticks-after {
     display: none !important;
 }
 .op-controls--hidden .op-controls .op-controls__progress--seek::-webkit-slider-thumb {

diff --git a/src/js/controls.ts b/src/js/controls.ts
@@ -173,22 +173,22 @@ class Controls implements PlayerComponent {
 
         if (!IS_ANDROID && !IS_IOS) {
             this.events.mouse.mouseenter = () => {
-                if (isMediaVideo) {
+                if (isMediaVideo && this.player.isMedia() && !this.player.activeElement().paused) {
                     this._stopControlTimer();
                     this.player.playBtn.setAttribute('aria-hidden', 'false');
                     this.player.getContainer().classList.remove('op-controls--hidden');
                     this._startControlTimer(2500);
                 }
             };
             this.events.mouse.mousemove = () => {
-                if (isMediaVideo) {
+                if (isMediaVideo && this.player.isMedia() && !this.player.activeElement().paused) {
                     this.player.playBtn.setAttribute('aria-hidden', 'false');
                     this.player.getContainer().classList.remove('op-controls--hidden');
                     this._startControlTimer(2500);
                 }
             };
             this.events.mouse.mouseleave = () => {
-                if (isMediaVideo) {
+                if (isMediaVideo && this.player.isMedia() && !this.player.activeElement().paused) {
                     this._startControlTimer(1000);
                 }
             };

diff --git a/src/js/player.ts b/src/js/player.ts
@@ -806,7 +806,7 @@ class Player {
             this.events.pause = () => {
                 this.loader.setAttribute('aria-hidden', 'true');
                 this.playBtn.classList.remove('op-player__play--paused');
-                this.playBtn.setAttribute('aria-hidden', IS_ANDROID || IS_IOS ? 'false' : 'true');
+                this.playBtn.setAttribute('aria-hidden', 'false');
                 this.playBtn.title = this.options.labels.play;
             };
         }