web/video.js
1
0
Fork 0
mirror of https://github.com/videojs/video.js.git synced 2025-02-04 11:43:27 +02:00
Code Releases Activity

@dmlap switched events to not bubble by default. closes #2351

Browse Source
This commit is contained in:
David LaPalomento 2015-07-21 09:58:12 -07:00 committed by heff
parent 1eb416deef
commit 07f0483780
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -67,6 +67,7 @@ CHANGELOG
* @heff sped up testing ([view](https://github.com/videojs/video.js/pull/2254)) * @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)) * 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)) * 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))
-------------------- --------------------

6
src/js/utils/events.js
View File

@ -17,7 +17,7 @@ import document from 'global/document';
* It stores the handler function in a separate cache object * It stores the handler function in a separate cache object
* and adds a generic handler to the element's event, * and adds a generic handler to the element's event,
* along with a unique id (guid) to the element. * along with a unique id (guid) to the element.
* *
* @param {Element|Object} elem Element or object to bind listeners to * @param {Element|Object} elem Element or object to bind listeners to
* @param {String|Array} type Type of event to bind to. * @param {String|Array} type Type of event to bind to.
* @param {Function} fn Event listener. * @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) // Unless explicitly stopped or the event does not bubble (e.g. media events)
// recursively calls this function to bubble the event up the DOM. // 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); trigger.call(null, parent, event, hash);
// If at the top of the DOM, triggers the default action unless disabled. // 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 * Fix a native event to have standard property values
* *
* @param {Object} event Event object to fix * @param {Object} event Event object to fix
* @return {Object} * @return {Object}
* @private * @private