This commit is contained in:
Sam Potts
2018-03-28 00:17:15 +11:00
parent 951df64b7f
commit 2b7fe9a4f9
20 changed files with 55 additions and 32 deletions

View File

@ -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);
}
};