fix(core): fix #978, should be able to clear onhandler added before z…

…one.js

lib/common/utils.ts

@@ -21,6 +21,7 @@ const _global: any =
 const FUNCTION = 'function';
 const UNDEFINED = 'undefined';
 const REMOVE_ATTRIBUTE = 'removeAttribute';
+const NULL_ON_PROP_VALUE: any[] = [null];
 
 export function bindArguments(args: any[], source: string): any[] {
   for (let i = args.length - 1; i >= 0; i--) {
@@ -133,6 +134,7 @@ export function patchProperty(obj: any, prop: string, prototype?: any) {
   delete desc.writable;
   delete desc.value;
   const originalDescGet = desc.get;
+  const originalDescSet = desc.set;
 
   // substr(2) cuz 'onclick' -> 'click', etc
   const eventName = prop.substr(2);
@@ -157,6 +159,12 @@ export function patchProperty(obj: any, prop: string, prototype?: any) {
       target.removeEventListener(eventName, wrapFn);
     }
 
+    // issue #978, when onload handler was added before loading zone.js
+    // we should remove it with originalDescSet
+    if (originalDescSet) {
+      originalDescSet.apply(target, NULL_ON_PROP_VALUE);
+    }
+
     if (typeof newValue === 'function') {
       target[eventNameSymbol] = newValue;
       target.addEventListener(eventName, wrapFn, false);

test/browser/browser.spec.ts

@@ -208,6 +208,29 @@ describe('Zone', function() {
             });
           });
 
+          it('should be able to clear on handler added before load zone.js', function() {
+            const TestTarget: any = (window as any)['TestTarget'];
+            patchFilteredProperties(
+                TestTarget.prototype, ['prop3'], global['__Zone_ignore_on_properties']);
+            const testTarget = new TestTarget();
+            Zone.current.fork({name: 'test'}).run(() => {
+              expect(testTarget.onprop3).toBeTruthy();
+              const newProp3Handler = function() {};
+              testTarget.onprop3 = newProp3Handler;
+              expect(testTarget.onprop3).toBe(newProp3Handler);
+              testTarget.onprop3 = null;
+              expect(!testTarget.onprop3).toBeTruthy();
+              testTarget.onprop3 = function() {
+                // onprop1 should not be patched
+                expect(Zone.current.name).toEqual('test');
+              };
+            });
+
+            Zone.current.fork({name: 'test1'}).run(() => {
+              testTarget.dispatchEvent('prop3');
+            });
+          });
+
           it('window onclick should be in zone',
              ifEnvSupports(canPatchOnProperty(window, 'onmousedown'), function() {
                zone.run(function() {

test/test_fake_polyfill.ts

@@ -32,6 +32,16 @@
   Object.defineProperties(TestTarget.prototype, {
     'onprop1': {configurable: true, writable: true},
     'onprop2': {configurable: true, writable: true},
+    'onprop3': {
+      configurable: true,
+      get: function() {
+        return this._onprop3;
+      },
+      set: function(_value) {
+        this._onprop3 = _value;
+      }
+    },
+    '_onprop3': {configurable: true, writable: true, value: function() {}},
     'addEventListener': {
       configurable: true,
       writable: true,