completely remove function listeners

emberjs · Sep 27, 2018 · 6b685a0 · 6b685a0
1 parent 7e1c4be
commit 6b685a0
Showing 1 changed file with 14 additions and 2 deletions.
diff --git a/packages/@ember/-internals/meta/lib/meta.ts b/packages/@ember/-internals/meta/lib/meta.ts
@@ -552,8 +552,20 @@ export class Meta {
         kind,
       } as Listener);
     } else {
-      // update own listener
-      listeners[i].kind = kind;
+      let listener = listeners[i];
+      // If the listener is our own function listener and we are trying to
+      // remove it, we want to splice it out entirely so we don't hold onto a
+      // reference.
+      if (
+        typeof method === 'function' &&
+        kind === ListenerKind.REMOVE &&
+        listener.kind !== ListenerKind.REMOVE
+      ) {
+        listeners.splice(i, 1);
+      } else {
+        // update own listener
+        listener.kind = kind;
+      }
     }
   }