diff options
| author | Sam Potts <sam@potts.es> | 2020-01-13 16:18:38 +0000 |
|---|---|---|
| committer | Sam Potts <sam@potts.es> | 2020-01-13 16:18:38 +0000 |
| commit | 6b0e5cd6f1b4c0905bd6f081e8f0fb93dc5f5e75 (patch) | |
| tree | da9cadc4797b9b1f1f2fd3181bfea40a2a5eb348 | |
| parent | 2463434d27ebad308bc64492d067e29c6d4e60c2 (diff) | |
| parent | cb4dab42509954ee88c1f9fd53762bc0632556ac (diff) | |
| download | plyr-6b0e5cd6f1b4c0905bd6f081e8f0fb93dc5f5e75.tar.lz plyr-6b0e5cd6f1b4c0905bd6f081e8f0fb93dc5f5e75.tar.xz plyr-6b0e5cd6f1b4c0905bd6f081e8f0fb93dc5f5e75.zip | |
Merge branch 'master' into develop
| -rw-r--r-- | readme.md | 2 | ||||
| -rw-r--r-- | src/js/listeners.js | 2 |
2 files changed, 2 insertions, 2 deletions
@@ -276,7 +276,7 @@ Note the single quotes encapsulating the JSON and double quotes on the object ke | `enabled` | Boolean | `true` | Completely disable Plyr. This would allow you to do a User Agent check or similar to programmatically enable or disable Plyr for a certain UA. Example below. | | `debug` | Boolean | `false` | Display debugging information in the console | | `controls` | Array, Function or Element | `['play-large', 'play', 'progress', 'current-time', 'mute', 'volume', 'captions', 'settings', 'pip', 'airplay', 'fullscreen']` | If a function is passed, it is assumed your method will return either an element or HTML string for the controls. Three arguments will be passed to your function; `id` (the unique id for the player), `seektime` (the seektime step in seconds), and `title` (the media title). See [controls.md](controls.md) for more info on how the html needs to be structured. | -| `settings` | Array | `['captions', 'quality', 'speed', 'loop']` | If you're using the default controls are used then you can specify which settings to show in the menu | +| `settings` | Array | `['captions', 'quality', 'speed', 'loop']` | If the default controls are used, you can specify which settings to show in the menu | | `i18n` | Object | See [defaults.js](/src/js/config/defaults.js) | Used for internationalization (i18n) of the text within the UI. | | `loadSprite` | Boolean | `true` | Load the SVG sprite specified as the `iconUrl` option (if a URL). If `false`, it is assumed you are handling sprite loading yourself. | | `iconUrl` | String | `null` | Specify a URL or path to the SVG sprite. See the [SVG section](#svg) for more info. | diff --git a/src/js/listeners.js b/src/js/listeners.js index c5076ff3..354dc605 100644 --- a/src/js/listeners.js +++ b/src/js/listeners.js @@ -513,7 +513,7 @@ class Listeners { } // Only call default handler if not prevented in custom handler - if (returned && is.function(defaultHandler)) { + if (returned !== false && is.function(defaultHandler)) { defaultHandler.call(player, event); } } |