2 files changed, 11 insertions, 27 deletions

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
diff --git a/src/js/utils/events.js b/src/js/utils/events.js
index a8e05f54..d6ffc043 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 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 = [];