[fix] Prevent on<event> setters from removing all listeners (#955)

websockets · Jan 9, 2017 · 20585ee · 20585ee
1 parent c843e6a
commit 20585ee
Showing 1 changed file with 11 additions and 3 deletions.
diff --git a/lib/WebSocket.js b/lib/WebSocket.js
@@ -409,8 +409,10 @@ WebSocket.CLOSED = 3;
      * @public
      */
     get () {
-      const listener = this.listeners(method)[0];
-      return listener ? listener._listener ? listener._listener : listener : undefined;
+      const listeners = this.listeners(method);
+      for (var i = 0; i < listeners.length; i++) {
+        if (listeners[i]._listener) return listeners[i]._listener;
+      }
     },
     /**
      * Add a listener for the event.
@@ -419,7 +421,13 @@ WebSocket.CLOSED = 3;
      * @public
      */
     set (listener) {
-      this.removeAllListeners(method);
+      const listeners = this.listeners(method);
+      for (var i = 0; i < listeners.length; i++) {
+        //
+        // Remove only the listeners added via `addEventListener`.
+        //
+        if (listeners[i]._listener) this.removeListener(method, listeners[i]);
+      }
       this.addEventListener(method, listener);
     }
   });