iSharkFly-Docs
/
angular-docs-cn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(zone.js): should remove on symbol property after removeAllListeners (#31644) 

Close #31643

PR Close #31644
This commit is contained in:
JiaLiPassion 2019-07-19 14:49:55 +09:00 committed by Miško Hevery
parent 17b32b5fd4
commit a182714703
2 changed files with 33 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
packages/zone.js/lib/common/events.ts
View File

@ -540,6 +540,13 @@ export function patchEventTarget(
// remove globalZoneAwareCallback and remove the task cache from target
(existingTask as any).allRemoved = true;
target[symbolEventName] = null;
// in the target, we have an event listener which is added by on_property
// such as target.onclick = function() {}, so we need to clear this internal
// property too if all delegates all removed
if (typeof eventName === 'string') {
const onPropertySymbol = ZONE_SYMBOL_PREFIX + 'ON_PROPERTY' + eventName;
target[onPropertySymbol] = null;
}
}
existingTask.zone.cancelTask(existingTask);
if (returnTarget) {

31
packages/zone.js/test/browser/browser.spec.ts
View File

@ -245,7 +245,7 @@ describe('Zone', function() {
Zone.current.fork({name: 'test1'}).run(() => { testTarget.dispatchEvent('prop3'); });
});
it('window onclick should be in zone',
it('window onmousedown should be in zone',
ifEnvSupports(canPatchOnProperty(window, 'onmousedown'), function() {
zone.run(function() { window.onmousedown = eventListenerSpy; });
@ -254,6 +254,10 @@ describe('Zone', function() {
expect(hookSpy).toHaveBeenCalled();
expect(eventListenerSpy).toHaveBeenCalled();
window.removeEventListener('mousedown', eventListenerSpy);
expect((window as any)[zoneSymbol('ON_PROPERTYmousedown')])
.toEqual(eventListenerSpy);
window.onmousedown = null;
expect(!!(window as any)[zoneSymbol('ON_PROPERTYmousedown')]).toBeFalsy();
}));
it('window onresize should be patched',
@ -264,9 +268,12 @@ describe('Zone', function() {
innerResizeProp();
expect(eventListenerSpy).toHaveBeenCalled();
window.removeEventListener('resize', eventListenerSpy);
expect((window as any)[zoneSymbol('ON_PROPERTYresize')]).toEqual(eventListenerSpy);
window.onresize = null;
expect(!!(window as any)[zoneSymbol('ON_PROPERTYresize')]).toBeFalsy();
}));
it('document onclick should be in zone',
it('document onmousedown should be in zone',
ifEnvSupports(canPatchOnProperty(Document.prototype, 'onmousedown'), function() {
zone.run(function() { document.onmousedown = eventListenerSpy; });
@ -275,6 +282,10 @@ describe('Zone', function() {
expect(hookSpy).toHaveBeenCalled();
expect(eventListenerSpy).toHaveBeenCalled();
document.removeEventListener('mousedown', eventListenerSpy);
expect((document as any)[zoneSymbol('ON_PROPERTYmousedown')])
.toEqual(eventListenerSpy);
document.onmousedown = null;
expect(!!(document as any)[zoneSymbol('ON_PROPERTYmousedown')]).toBeFalsy();
}));
// TODO: JiaLiPassion, need to find out why the test bundle is not `use strict`.
@ -342,7 +353,7 @@ describe('Zone', function() {
}
}));
it('SVGElement onclick should be in zone',
it('SVGElement onmousedown should be in zone',
ifEnvSupports(
canPatchOnProperty(SVGElement && SVGElement.prototype, 'onmousedown'), function() {
const svg = document.createElementNS('http://www.w3.org/2000/svg', 'svg');
@ -1921,15 +1932,20 @@ describe('Zone', function() {
const listener2 = function() { logs.push('listener2'); };
const listener3 = {handleEvent: function(event: Event) { logs.push('listener3'); }};
const listener4 = function() { logs.push('listener4'); };
const listener5 = function() { logs.push('listener5'); };
button.addEventListener('mouseover', listener1);
button.addEventListener('mouseover', listener2);
button.addEventListener('mouseover', listener3);
button.addEventListener('click', listener4);
button.onmouseover = listener5;
expect((button as any)[Zone.__symbol__('ON_PROPERTYmouseover')]).toEqual(listener5);
(button as any).removeAllListeners('mouseover');
const listeners = (button as any).eventListeners('mouseove');
const listeners = (button as any).eventListeners('mouseover');
expect(listeners.length).toBe(0);
expect((button as any)[Zone.__symbol__('ON_PROPERTYmouseover')]).toBeNull();
expect(!!button.onmouseover).toBeFalsy();
const mouseEvent = document.createEvent('Event');
mouseEvent.initEvent('mouseover', true, true);
@ -1957,7 +1973,7 @@ describe('Zone', function() {
button.addEventListener('click', listener4, true);
(button as any).removeAllListeners('mouseover');
const listeners = (button as any).eventListeners('mouseove');
const listeners = (button as any).eventListeners('mouseover');
expect(listeners.length).toBe(0);
const mouseEvent = document.createEvent('Event');
@ -2007,15 +2023,20 @@ describe('Zone', function() {
const listener2 = function() { logs.push('listener2'); };
const listener3 = {handleEvent: function(event: Event) { logs.push('listener3'); }};
const listener4 = function() { logs.push('listener4'); };
const listener5 = function() { logs.push('listener5'); };
button.addEventListener('mouseover', listener1);
button.addEventListener('mouseover', listener2);
button.addEventListener('mouseover', listener3);
button.addEventListener('click', listener4);
button.onmouseover = listener5;
expect((button as any)[Zone.__symbol__('ON_PROPERTYmouseover')]).toEqual(listener5);
(button as any).removeAllListeners();
const listeners = (button as any).eventListeners('mouseover');
expect(listeners.length).toBe(0);
expect((button as any)[Zone.__symbol__('ON_PROPERTYmouseover')]).toBeNull();
expect(!!button.onmouseover).toBeFalsy();
const mouseEvent = document.createEvent('Event');
mouseEvent.initEvent('mouseover', true, true);