diff options
author | Sam Potts <me@sampotts.me> | 2015-04-06 19:42:26 +1000 |
---|---|---|
committer | Sam Potts <me@sampotts.me> | 2015-04-06 19:42:26 +1000 |
commit | 3526e322ef1433b76a926241131abf7f165acf3a (patch) | |
tree | 8cd0187cef657224234ff3fcda5ade1b624486e5 /src | |
parent | 99cabd545dda501fa23f4f1e917c3a586adea2a2 (diff) | |
download | plyr-3526e322ef1433b76a926241131abf7f165acf3a.tar.lz plyr-3526e322ef1433b76a926241131abf7f165acf3a.tar.xz plyr-3526e322ef1433b76a926241131abf7f165acf3a.zip |
Minor bug fixes
Diffstat (limited to 'src')
-rw-r--r-- | src/js/plyr.js | 13 | ||||
-rw-r--r-- | src/less/plyr.less | 2 | ||||
-rw-r--r-- | src/sass/plyr.scss | 2 |
3 files changed, 11 insertions, 6 deletions
diff --git a/src/js/plyr.js b/src/js/plyr.js index 83ba3282..9a678696 100644 --- a/src/js/plyr.js +++ b/src/js/plyr.js @@ -1111,6 +1111,11 @@ // Set class hook _toggleClass(player.container, config.classes.fullscreen.active, player.isFullscreen); + + // Remove hover class because mouseleave doesn't occur + if (player.isFullscreen) { + _toggleClass(player.controls, config.classes.hover, false); + } } // Bail from faux-fullscreen @@ -1485,14 +1490,14 @@ if(player.type === "video" && config.click) { _on(player.videoContainer, "click", function() { if(player.media.paused) { - _play(); + _triggerEvent(player.buttons.play, "click"); } else if(player.media.ended) { _seek(); - _play(); + _triggerEvent(player.buttons.play, "click"); } else { - _pause(); + _triggerEvent(player.buttons.pause, "click"); } }); } @@ -1501,7 +1506,7 @@ if(config.fullscreen.hideControls) { _on(player.controls, "mouseenter mouseleave", function(event) { _toggleClass(player.controls, config.classes.hover, (event.type === "mouseenter")); - }) + }); } } diff --git a/src/less/plyr.less b/src/less/plyr.less index e0402e92..4bd4c1ab 100644 --- a/src/less/plyr.less +++ b/src/less/plyr.less @@ -9,7 +9,7 @@ @gray-dark: #343f4a; @gray: #565d64; @gray-light: #cbd0d3; -@off-white: #f9fafb; +@off-white: #d6dadd; // Font sizes @font-size-small: 14px; diff --git a/src/sass/plyr.scss b/src/sass/plyr.scss index e1fb4960..5a63ed9e 100644 --- a/src/sass/plyr.scss +++ b/src/sass/plyr.scss @@ -9,7 +9,7 @@ $blue: #3498DB; $gray-dark: #343f4a; $gray: #565d64; $gray-light: #cbd0d3; -$off-white: #f9fafb; +$off-white: #d6dadd; // Font sizes $font-size-small: 14px; |