diff --git a/CHANGELOG.md b/CHANGELOG.md index 5624d21e9..bd4f022dd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -67,6 +67,7 @@ CHANGELOG * @heff sped up testing ([view](https://github.com/videojs/video.js/pull/2254)) * pass fs state to player from enterFullscreen, split full-window styles into their own selector ([view](https://github.com/videojs/video.js/pull/2357)) * Fixed vertical option for volumeMenuButton ([view](https://github.com/videojs/video.js/pull/2352)) +* @dmlap switched events to not bubble by default ([view](https://github.com/videojs/video.js/pull/2351)) -------------------- diff --git a/src/js/utils/events.js b/src/js/utils/events.js index 3b24c988c..c210444ba 100644 --- a/src/js/utils/events.js +++ b/src/js/utils/events.js @@ -17,7 +17,7 @@ import document from 'global/document'; * It stores the handler function in a separate cache object * and adds a generic handler to the element's event, * along with a unique id (guid) to the element. - * + * * @param {Element|Object} elem Element or object to bind listeners to * @param {String|Array} type Type of event to bind to. * @param {Function} fn Event listener. @@ -161,7 +161,7 @@ export function trigger(elem, event, hash) { // Unless explicitly stopped or the event does not bubble (e.g. media events) // recursively calls this function to bubble the event up the DOM. - if (parent && !event.isPropagationStopped() && event.bubbles !== false) { + if (parent && !event.isPropagationStopped() && event.bubbles === true) { trigger.call(null, parent, event, hash); // If at the top of the DOM, triggers the default action unless disabled. @@ -208,7 +208,7 @@ export function one(elem, type, fn) { /** * Fix a native event to have standard property values - * + * * @param {Object} event Event object to fix * @return {Object} * @private