diff options
author | Sam Potts <sam@potts.es> | 2018-05-06 01:32:51 +1000 |
---|---|---|
committer | Sam Potts <sam@potts.es> | 2018-05-06 01:32:51 +1000 |
commit | 165515009266a5dc0b625cef26cf6ba1a80bb12e (patch) | |
tree | ac915eb715c418a75d4bd1c185cd290c5e051667 /src/js | |
parent | ceb6c9a10058c2ab663bd588e14333ac3564bff6 (diff) | |
download | plyr-165515009266a5dc0b625cef26cf6ba1a80bb12e.tar.lz plyr-165515009266a5dc0b625cef26cf6ba1a80bb12e.tar.xz plyr-165515009266a5dc0b625cef26cf6ba1a80bb12e.zip |
v3.3.5
Diffstat (limited to 'src/js')
-rw-r--r-- | src/js/defaults.js | 2 | ||||
-rw-r--r-- | src/js/listeners.js | 9 | ||||
-rw-r--r-- | src/js/plugins/ads.js | 2 | ||||
-rw-r--r-- | src/js/plyr.js | 5 | ||||
-rw-r--r-- | src/js/plyr.polyfilled.js | 2 | ||||
-rw-r--r-- | src/js/ui.js | 7 |
6 files changed, 21 insertions, 6 deletions
diff --git a/src/js/defaults.js b/src/js/defaults.js index 2e17b696..4a2c92b5 100644 --- a/src/js/defaults.js +++ b/src/js/defaults.js @@ -56,7 +56,7 @@ const defaults = { // Sprite (for icons) loadSprite: true, iconPrefix: 'plyr', - iconUrl: 'https://cdn.plyr.io/3.3.3/plyr.svg', + iconUrl: 'https://cdn.plyr.io/3.3.5/plyr.svg', // Blank video (used to prevent errors on source change) blankVideo: 'https://cdn.plyr.io/static/blank.mp4', diff --git a/src/js/listeners.js b/src/js/listeners.js index adb60937..f4e9ade3 100644 --- a/src/js/listeners.js +++ b/src/js/listeners.js @@ -489,12 +489,19 @@ class Listeners { on(this.player.elements.settings.form, 'click', event => { event.stopPropagation(); + // Go back to home tab on click + const showHomeTab = () => { + const id = `plyr-settings-${this.player.id}-home`; + controls.showTab.call(this.player, id); + }; + // Settings menu items - use event delegation as items are added/removed if (utils.matches(event.target, this.player.config.selectors.inputs.language)) { proxy( event, () => { this.player.language = event.target.value; + showHomeTab(); }, 'language', ); @@ -503,6 +510,7 @@ class Listeners { event, () => { this.player.quality = event.target.value; + showHomeTab(); }, 'quality', ); @@ -511,6 +519,7 @@ class Listeners { event, () => { this.player.speed = parseFloat(event.target.value); + showHomeTab(); }, 'speed', ); diff --git a/src/js/plugins/ads.js b/src/js/plugins/ads.js index 79c00ab3..0246e221 100644 --- a/src/js/plugins/ads.js +++ b/src/js/plugins/ads.js @@ -44,7 +44,7 @@ class Ads { } get enabled() { - return this.player.isHTML5 && this.player.isVideo && this.player.config.ads.enabled && utils.is.string(this.publisherId) && this.publisherId.length; + return this.player.isVideo && this.player.config.ads.enabled && !utils.is.empty(this.publisherId); } /** diff --git a/src/js/plyr.js b/src/js/plyr.js index be32aa6d..acf1ce19 100644 --- a/src/js/plyr.js +++ b/src/js/plyr.js @@ -1,6 +1,6 @@ // ========================================================================== // Plyr -// plyr.js v3.3.3 +// plyr.js v3.3.5 // https://github.com/sampotts/plyr // License: The MIT License (MIT) // ========================================================================== @@ -396,7 +396,8 @@ class Plyr { */ stop() { if (this.isHTML5) { - this.media.load(); + this.pause(); + this.restart(); } else if (utils.is.function(this.media.stop)) { this.media.stop(); } diff --git a/src/js/plyr.polyfilled.js b/src/js/plyr.polyfilled.js index 6e6d302e..ca5e219c 100644 --- a/src/js/plyr.polyfilled.js +++ b/src/js/plyr.polyfilled.js @@ -1,6 +1,6 @@ // ========================================================================== // Plyr Polyfilled Build -// plyr.js v3.3.3 +// plyr.js v3.3.5 // https://github.com/sampotts/plyr // License: The MIT License (MIT) // ========================================================================== diff --git a/src/js/ui.js b/src/js/ui.js index 609d6ab5..2347b5c8 100644 --- a/src/js/ui.js +++ b/src/js/ui.js @@ -158,7 +158,7 @@ const ui = { }, // Check playing state - checkPlaying() { + checkPlaying(event) { // Class hooks utils.toggleClass(this.elements.container, this.config.classNames.playing, this.playing); utils.toggleClass(this.elements.container, this.config.classNames.paused, this.paused); @@ -167,6 +167,11 @@ const ui = { // Set ARIA state utils.toggleState(this.elements.buttons.play, this.playing); + // Only update controls on non timeupdate events + if (utils.is.event(event) && event.type === 'timeupdate') { + return; + } + // Toggle controls this.toggleControls(!this.playing); }, |