From fb48b330cc590d39b44ac508f232c552d97e3925 Mon Sep 17 00:00:00 2001 From: Albin Larsson Date: Tue, 12 Jun 2018 17:41:17 +0200 Subject: typo --- src/js/utils/events.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/js/utils') diff --git a/src/js/utils/events.js b/src/js/utils/events.js index a8e05f54..b91195d9 100644 --- a/src/js/utils/events.js +++ b/src/js/utils/events.js @@ -28,7 +28,7 @@ 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 + // Bail if no elements, event, or callback if (is.empty(elements) || is.empty(event) || !is.function(callback)) { return; } -- cgit v1.2.3 From f15c1344b0975e7f692492b775062489ee4b1302 Mon Sep 17 00:00:00 2001 From: Albin Larsson Date: Tue, 12 Jun 2018 19:10:00 +0200 Subject: Removed support for multiple elements in toggleListener --- src/js/utils/events.js | 26 +++++++------------------- 1 file changed, 7 insertions(+), 19 deletions(-) (limited to 'src/js/utils') diff --git a/src/js/utils/events.js b/src/js/utils/events.js index b91195d9..3923f291 100644 --- a/src/js/utils/events.js +++ b/src/js/utils/events.js @@ -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 elements, 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, once = false) { + // Bail if no element, event, or callback + if (!is.element(element) || is.empty(event) || !is.function(callback)) { return; } @@ -66,10 +54,10 @@ export function toggleListener(elements, event, callback, toggle = false, passiv events.forEach(type => { if (this && this.eventListeners && toggle && !once) { // 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); }); } @@ -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 = []; -- cgit v1.2.3 From 53933dff7eaa8074e57cccc7cab18d5be6c83fc4 Mon Sep 17 00:00:00 2001 From: Albin Larsson Date: Tue, 12 Jun 2018 19:39:26 +0200 Subject: Use toggleListener in trapFocus --- src/js/utils/elements.js | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'src/js/utils') diff --git a/src/js/utils/elements.js b/src/js/utils/elements.js index 4d4f97cd..55866367 100644 --- a/src/js/utils/elements.js +++ b/src/js/utils/elements.js @@ -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 -- cgit v1.2.3 From 927326f715132d56c79de70e9b871594514caa2f Mon Sep 17 00:00:00 2001 From: Albin Larsson Date: Tue, 12 Jun 2018 19:43:08 +0200 Subject: Also remove 'once' event listeners when destroying (they may still be waiting) --- src/js/utils/events.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/js/utils') diff --git a/src/js/utils/events.js b/src/js/utils/events.js index 3923f291..d6ffc043 100644 --- a/src/js/utils/events.js +++ b/src/js/utils/events.js @@ -27,7 +27,7 @@ const supportsPassiveListeners = (() => { })(); // Toggle event listener -export function toggleListener(element, event, callback, toggle = false, passive = true, capture = false, once = false) { +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; @@ -52,7 +52,7 @@ export function toggleListener(element, event, callback, toggle = false, passive // 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({ element, type, callback, options }); } @@ -78,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 -- cgit v1.2.3