Added validation to event listener to check if the event is actually

event/EventBusImpl.js

@@ -58,7 +58,7 @@ export default class EventBusImpl extends EventBus {
      *
      * @type {WeakMap<EventTarget, WeakSet<function(Event)>>}
      */
-    this._allEventListeners = new WeakMap();
+    this._allListenersTargets = new WeakMap();
   }
 
   /**
@@ -90,12 +90,18 @@ export default class EventBusImpl extends EventBus {
    * @inheritdoc
    */
   listenAll(eventTarget, listener) {
-    this._window.bindEventListener(eventTarget, IMA_EVENT, listener);
-
-    if (!this._allEventListeners.has(eventTarget)) {
-      this._allEventListeners.set(eventTarget, new WeakSet());
+    if (!this._allListenersTargets.has(eventTarget)) {
+      this._allListenersTargets.set(eventTarget, new WeakMap());
     }
-    this._allEventListeners.get(eventTarget).add(listener);
+
+    var nativeListener = event => {
+      if (event.detail.eventName && event.type === IMA_EVENT) {
+        listener(event);
+      }
+    };
+    this._allListenersTargets.get(eventTarget).set(listener, nativeListener);
+
+    this._window.bindEventListener(eventTarget, IMA_EVENT, nativeListener);
 
     return this;
   }
@@ -115,7 +121,7 @@ export default class EventBusImpl extends EventBus {
 
     var eventNameToNativeListener = targetToEventName.get(eventTarget);
     var nativeListener = event => {
-      if (event.detail.eventName === eventName) {
+      if (event.detail.eventName === eventName && event.type === IMA_EVENT) {
         listener(event);
       }
     };
@@ -130,24 +136,39 @@ export default class EventBusImpl extends EventBus {
    * @inheritdoc
    */
   unlistenAll(eventTarget, listener) {
-    this._window.unbindEventListener(eventTarget, IMA_EVENT, listener);
+    if (!this._allListenersTargets.has(eventTarget)) {
+      if ($Debug) {
+        console.warn(
+          'The provided listener is not registered on the ' +
+            'specified event target'
+        );
+      }
 
-    var listenerRegistered =
-      this._allEventListeners.has(eventTarget) &&
-      this._allEventListeners.get(eventTarget).has(listener);
-    if (listenerRegistered) {
-      this._allEventListeners.get(eventTarget).delete(listener);
+      return this;
     }
 
-    if ($Debug) {
-      if (!listenerRegistered) {
+    var listeners = this._allListenersTargets.get(eventTarget);
+    if (!listeners.has(listener)) {
+      if ($Debug) {
         console.warn(
           'The provided listener is not registered on the ' +
             'specified event target'
         );
       }
+
+      return this;
     }
 
+    var nativeListener = listeners.get(listener);
+    this._window.unbindEventListener(eventTarget, IMA_EVENT, nativeListener);
+
+    listeners.delete(listener);
+    if (listeners.size) {
+      return this;
+    }
+
+    this._allListenersTargets.delete(eventTarget);
+
     return this;
   }
 

event/__tests__/EventBusSpec.js

@@ -59,16 +59,18 @@ describe('ima.event.EventBusImpl', () => {
       eventBus.listenAll(eventTarget, listeners.listener2);
 
       expect(windowInterface.bindEventListener.calls.count()).toEqual(2);
-      expect(windowInterface.bindEventListener.calls.argsFor(0)).toEqual([
-        eventTarget,
-        IMA_EVENT,
-        listeners.listener1
-      ]);
-      expect(windowInterface.bindEventListener.calls.argsFor(1)).toEqual([
-        eventTarget,
-        IMA_EVENT,
-        listeners.listener2
-      ]);
+      expect(windowInterface.bindEventListener.calls.argsFor(0)[0]).toEqual(
+        eventTarget
+      );
+      expect(windowInterface.bindEventListener.calls.argsFor(0)[1]).toEqual(
+        IMA_EVENT
+      );
+	  expect(windowInterface.bindEventListener.calls.argsFor(1)[0]).toEqual(
+        eventTarget
+      );
+      expect(windowInterface.bindEventListener.calls.argsFor(1)[1]).toEqual(
+        IMA_EVENT
+      );
     });
   });
 
@@ -134,11 +136,12 @@ describe('ima.event.EventBusImpl', () => {
       eventBus.unlistenAll(eventTarget, listeners.listener1);
 
       expect(windowInterface.unbindEventListener.calls.count()).toEqual(1);
-      expect(windowInterface.unbindEventListener.calls.argsFor(0)).toEqual([
-        eventTarget,
-        IMA_EVENT,
-        listeners.listener1
-      ]);
+      expect(windowInterface.unbindEventListener.calls.argsFor(0)[0]).toEqual(
+        eventTarget
+      );
+      expect(windowInterface.unbindEventListener.calls.argsFor(0)[1]).toEqual(
+        IMA_EVENT
+      );
     });
   });
 });