fix removeListener when the listener is attached by EventEmitter.once

angular · Nov 5, 2016 · 2ee4711 · 2ee4711
1 parent 12a31e1
commit 2ee4711
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 5 deletions.
diff --git a/dist/zone-node.js b/dist/zone-node.js
@@ -710,7 +710,8 @@ function findExistingRegisteredTask(target, handler, name, capture, remove) {
         for (var i = 0; i < eventTasks.length; i++) {
             var eventTask = eventTasks[i];
             var data = eventTask.data;
-            if (data.handler === handler && data.useCapturing === capture && data.eventName === name) {
+            var listener = data.handler;
+            if ((data.handler === handler || listener.listener === handler) && data.useCapturing === capture && data.eventName === name) {
                 if (remove) {
                     eventTasks.splice(i, 1);
                 }

diff --git a/dist/zone.js b/dist/zone.js
@@ -741,7 +741,8 @@ function findExistingRegisteredTask(target, handler, name, capture, remove) {
         for (var i = 0; i < eventTasks.length; i++) {
             var eventTask = eventTasks[i];
             var data = eventTask.data;
-            if (data.handler === handler && data.useCapturing === capture && data.eventName === name) {
+            var listener = data.handler;
+            if ((data.handler === handler || listener.listener === handler) && data.useCapturing === capture && data.eventName === name) {
                 if (remove) {
                     eventTasks.splice(i, 1);
                 }