diff options
author | Sam Potts <me@sampotts.me> | 2015-02-28 01:17:56 +1100 |
---|---|---|
committer | Sam Potts <me@sampotts.me> | 2015-02-28 01:17:56 +1100 |
commit | 1216968c608d474627e7725d5da2555d5f3b64d1 (patch) | |
tree | aeca03d812229939f086919f4bd807e5cd447b7f /src/js | |
parent | 1d2bd227f15053fa77bcac39e475622d6553a398 (diff) | |
download | plyr-1216968c608d474627e7725d5da2555d5f3b64d1.tar.lz plyr-1216968c608d474627e7725d5da2555d5f3b64d1.tar.xz plyr-1216968c608d474627e7725d5da2555d5f3b64d1.zip |
Minor tweaks
Diffstat (limited to 'src/js')
-rw-r--r-- | src/js/plyr.js | 33 |
1 files changed, 14 insertions, 19 deletions
diff --git a/src/js/plyr.js b/src/js/plyr.js index 3d28b3c5..0ba24cba 100644 --- a/src/js/plyr.js +++ b/src/js/plyr.js @@ -1,6 +1,6 @@ // ========================================================================== // Plyr -// plyr.js v1.0.11 +// plyr.js v1.0.13 // https://github.com/sampotts/plyr // ========================================================================== // Credits: http://paypal.github.io/accessible-html5-video-player/ @@ -713,12 +713,6 @@ player.media.pause(); } - // Check playing state - function _checkPlaying() { - _toggleClass(player.container, config.classes.playing, !player.media.paused); - _toggleClass(player.container, config.classes.stopped, player.media.paused); - } - // Restart playback function _restart() { // Move to beginning @@ -736,7 +730,7 @@ // Rewind function _rewind(seekInterval) { // Use default if needed - if(typeof seekInterval === "undefined") { + if(typeof seekInterval !== "number") { seekInterval = config.seekInterval; } @@ -757,7 +751,7 @@ // Fast forward function _forward(seekInterval) { // Use default if needed - if(typeof seekInterval === "undefined") { + if(typeof seekInterval !== "number") { seekInterval = config.seekInterval; } @@ -775,6 +769,12 @@ } } + // Check playing state + function _checkPlaying() { + _toggleClass(player.container, config.classes.playing, !player.media.paused); + _toggleClass(player.container, config.classes.stopped, player.media.paused); + } + // Toggle fullscreen function _toggleFullscreen() { // Check for native support @@ -937,27 +937,23 @@ // Play _on(player.buttons.play, "click", function() { _play(); - player.buttons.pause.focus(); + setTimeout(function() { player.buttons.pause.focus(); }, 100); }); // Pause _on(player.buttons.pause, "click", function() { _pause(); - player.buttons.play.focus(); + setTimeout(function() { player.buttons.play.focus(); }, 100); }); // Restart _on(player.buttons.restart, "click", _restart); // Rewind - _on(player.buttons.rewind, "click", function() { - _rewind(config.seekInterval); - }); + _on(player.buttons.rewind, "click", _rewind); // Fast forward - _on(player.buttons.forward, "click", function() { - _forward(config.seekInterval); - }); + _on(player.buttons.forward, "click", _forward); // Get the HTML5 range input element and append audio volume adjustment on change _on(player.volume, "change", function() { @@ -1017,8 +1013,7 @@ if(player.type === "video") { player.captionsContainer.innerHTML = ""; } - _toggleClass(player.container, config.classes.stopped, true); - _toggleClass(player.container, config.classes.playing); + _checkPlaying(); }); // Check for buffer progress |