cargdev/angular
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(core): fix #20532, should be able to cancel listener from mixed zone (#20538)

Browse Source 
PR Close #20538
This commit is contained in:
JiaLi.Passion
2017-11-20 16:33:37 +09:00
committed by Miško Hevery
parent 2a9d2bacd5
commit a740e4f00a
2 changed files with 53 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
packages/platform-browser/src/dom/events/dom_events.ts
View File

@ -203,16 +203,26 @@ export class DomEventsPlugin extends EventManagerPlugin {
// just call native removeEventListener
return target[NATIVE_REMOVE_LISTENER].apply(target, [eventName, callback, false]);
}
// fix issue 20532, should be able to remove
// listener which was added inside of ngZone
let found = false;
for (let i = 0; i < taskDatas.length; i++) {
// remove listener from taskDatas if the callback equals
if (taskDatas[i].handler === callback) {
found = true;
taskDatas.splice(i, 1);
break;
}
}
if (taskDatas.length === 0) {
// all listeners are removed, we can remove the globalListener from target
underlyingRemove.apply(target, [eventName, globalListener, false]);
if (found) {
if (taskDatas.length === 0) {
// all listeners are removed, we can remove the globalListener from target
underlyingRemove.apply(target, [eventName, globalListener, false]);
}
} else {
// not found in taskDatas, the callback may be added inside of ngZone
// use native remove listener to remove the calback
target[NATIVE_REMOVE_LISTENER].apply(target, [eventName, callback, false]);
}
}
}