ProximaEntertainment/plyr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1030 from friday/event-improvements

Browse Source 
Minor event changes
This commit is contained in:
Sam Potts
2018-06-13 10:52:17 +10:00
committed by GitHub
parent 5dddf8b0ec 927326f715
commit 5c08363400
5 changed files with 19 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/js/utils/elements.js
View File

@ -2,7 +2,7 @@
// Element utils
// ==========================================================================
import { off, on } from './events';
import { toggleListener } from './events';
import is from './is';
// Wrap an element
@ -277,11 +277,7 @@ export function trapFocus(element = null, toggle = false) {
}
};
if (toggle) {
on(this.elements.container, 'keydown', trap, false);
} else {
off(this.elements.container, 'keydown', trap, false);
}
toggleListener.call(this, this.elements.container, 'keydown', trap, toggle, false);
}
// Toggle aria-pressed state on a toggle button

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

@ -27,21 +27,9 @@ const supportsPassiveListeners = (() => {
})();
// Toggle event listener
export function toggleListener(elements, event, callback, toggle = false, passive = true, capture = false, once = false) {
// Bail if no elemetns, event, or callback
if (is.empty(elements) || is.empty(event) || !is.function(callback)) {
return;
}
// If a nodelist is passed, call itself on each node
if (is.nodeList(elements) || is.array(elements)) {
// Create listener for each node
Array.from(elements).forEach(element => {
if (element instanceof Node) {
toggleListener.call(null, element, event, callback, toggle, passive, capture);
}
});
export function toggleListener(element, event, callback, toggle = false, passive = true, capture = false) {
// Bail if no element, event, or callback
if (!is.element(element) || is.empty(event) || !is.function(callback)) {
return;
}
@ -64,12 +52,12 @@ export function toggleListener(elements, event, callback, toggle = false, passiv
// If a single node is passed, bind the event listener
events.forEach(type => {
if (this && this.eventListeners && toggle && !once) {
if (this && this.eventListeners && toggle) {
// Cache event listener
this.eventListeners.push({ elements, type, callback, options });
this.eventListeners.push({ element, type, callback, options });
}
elements[toggle ? 'addEventListener' : 'removeEventListener'](type, callback, options);
element[toggle ? 'addEventListener' : 'removeEventListener'](type, callback, options);
});
}
@ -90,7 +78,7 @@ export function once(element, events = '', callback, passive = true, capture = f
callback.apply(this, args);
}
toggleListener(element, events, onceCallback, true, passive, capture, true);
toggleListener.call(this, element, events, onceCallback, true, passive, capture);
}
// Trigger event
@ -116,8 +104,8 @@ export function triggerEvent(element, type = '', bubbles = false, detail = {}) {
export function unbindListeners() {
if (this && this.eventListeners) {
this.eventListeners.forEach(item => {
const { elements, type, callback, options } = item;
elements.removeEventListener(type, callback, options);
const { element, type, callback, options } = item;
element.removeEventListener(type, callback, options);
});
this.eventListeners = [];