diff options
| author | Sam Potts <sam@potts.es> | 2018-03-28 00:17:15 +1100 |
|---|---|---|
| committer | Sam Potts <sam@potts.es> | 2018-03-28 00:17:15 +1100 |
| commit | 2b7fe9a4f92e0e0065c8f0e5148094e0961ba4c8 (patch) | |
| tree | 2c26f3539b615385090209dd51711c759b9653ce /src | |
| parent | 951df64b7fb9b0ff731115ecc528cb65ca2d8e1d (diff) | |
| download | plyr-2b7fe9a4f92e0e0065c8f0e5148094e0961ba4c8.tar.lz plyr-2b7fe9a4f92e0e0065c8f0e5148094e0961ba4c8.tar.xz plyr-2b7fe9a4f92e0e0065c8f0e5148094e0961ba4c8.zip | |
v3.0.6
Diffstat (limited to 'src')
| -rw-r--r-- | src/js/defaults.js | 2 | ||||
| -rw-r--r-- | src/js/listeners.js | 5 | ||||
| -rw-r--r-- | src/js/plyr.js | 2 | ||||
| -rw-r--r-- | src/js/plyr.polyfilled.js | 2 |
4 files changed, 6 insertions, 5 deletions
diff --git a/src/js/defaults.js b/src/js/defaults.js index 23b9cc4a..5d2cb657 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.0.5/plyr.svg', + iconUrl: 'https://cdn.plyr.io/3.0.6/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 a0edc7c6..b9d189b7 100644 --- a/src/js/listeners.js +++ b/src/js/listeners.js @@ -398,14 +398,15 @@ class Listeners { const proxy = (event, defaultHandler, customHandlerKey) => { const customHandler = this.player.config.listeners[customHandlerKey]; const hasCustomHandler = utils.is.function(customHandler); + let returned = true; // Execute custom handler if (hasCustomHandler) { - customHandler.call(this.player, event); + returned = customHandler.call(this.player, event); } // Only call default handler if not prevented in custom handler - if (!event.defaultPrevented && utils.is.function(defaultHandler)) { + if (returned && utils.is.function(defaultHandler)) { defaultHandler.call(this.player, event); } }; diff --git a/src/js/plyr.js b/src/js/plyr.js index 7c07e952..be930796 100644 --- a/src/js/plyr.js +++ b/src/js/plyr.js @@ -1,6 +1,6 @@ // ========================================================================== // Plyr -// plyr.js v3.0.5 +// plyr.js v3.0.6 // https://github.com/sampotts/plyr // License: The MIT License (MIT) // ========================================================================== diff --git a/src/js/plyr.polyfilled.js b/src/js/plyr.polyfilled.js index 7316e21b..71b33c0f 100644 --- a/src/js/plyr.polyfilled.js +++ b/src/js/plyr.polyfilled.js @@ -1,6 +1,6 @@ // ========================================================================== // Plyr Polyfilled Build -// plyr.js v3.0.5 +// plyr.js v3.0.6 // https://github.com/sampotts/plyr // License: The MIT License (MIT) // ========================================================================== |