fix: wrap non-configurable custom element callbacks

btford · btford · commit 383b47905d0a · 2014-06-05T16:07:06.000-07:00
Closes #24
diff --git a/test/patch/registerElement.spec.js b/test/patch/registerElement.spec.js
@@ -106,4 +106,28 @@ describe('document.registerElement', function () {
     });
   });
 
+
+  it('should work with prototypes that have non-writable, non-configurable descriptors', function () {
+    runs(function () {
+      var proto = Object.create(HTMLElement.prototype);
+      Object.defineProperty(proto, 'createdCallback', {
+        writeable: false,
+        configurable: false,
+        value: flagAndCheckZone
+      });
+      document.registerElement('x-prop-desc', {
+        prototype: proto
+      });
+      var elt = document.createElement('x-prop-desc');
+    });
+
+    waitsFor(function() {
+      return flag;
+    }, 'createdCallback to fire', 100);
+
+    runs(function() {
+      expect(hasParent).toBe(true);
+    });
+  });
+
 });
diff --git a/zone.js b/zone.js
@@ -368,6 +368,7 @@ Zone.patch = function patch () {
   }
   Zone.patchMutationObserverClass('MutationObserver');
   Zone.patchMutationObserverClass('WebKitMutationObserver');
+  Zone.patchDefineProperty();
   Zone.patchRegisterElement();
 };
 
@@ -512,6 +513,49 @@ Zone.patchMutationObserverClass = function (className) {
   }
 };
 
+// might need similar for object.freeze
+// i regret nothing
+Zone.patchDefineProperty = function () {
+  var _defineProperty = Object.defineProperty;
+  var _getOwnPropertyDescriptor = Object.getOwnPropertyDescriptor;
+
+  Object.defineProperty = function (obj, prop, desc) {
+    if (isUnconfigurable(obj, prop)) {
+      throw new TypeError('Cannot assign to read only property \'' + prop + '\' of ' + obj);
+    }
+    return rewriteDescriptor(obj, prop, desc);
+  };
+
+  Object.getOwnPropertyDescriptor = function (obj, prop) {
+    var desc = _getOwnPropertyDescriptor(obj, prop);
+    if (isUnconfigurable(obj, prop)) {
+      desc.configurable = false;
+    }
+    return desc;
+  };
+
+  Zone._redefineProperty = function (obj, prop, desc) {
+    return rewriteDescriptor(obj, prop, desc);
+  };
+
+  function isUnconfigurable (obj, prop) {
+    return obj && obj.__unconfigurables && obj.__unconfigurables[prop];
+  }
+
+  function rewriteDescriptor (obj, prop, desc) {
+    if (!desc.configurable) {
+      desc.configurable = true;
+      if (!obj.__unconfigurables) {
+        _defineProperty(obj, '__unconfigurables', {
+          value: {}
+        });
+      }
+      obj.__unconfigurables[prop] = true;
+    }
+    return _defineProperty(obj, prop, desc);
+  }
+};
+
 Zone.patchRegisterElement = function () {
   if (!('registerElement' in document)) {
     return;
@@ -526,7 +570,11 @@ Zone.patchRegisterElement = function () {
   document.registerElement = function (name, opts) {
     callbacks.forEach(function (callback) {
       if (opts.prototype[callback]) {
-        opts.prototype[callback] = zone.bind(opts.prototype[callback]);
+        var descriptor = Object.getOwnPropertyDescriptor(opts.prototype, callback);
+        if (descriptor.value) {
+          descriptor.value = zone.bind(descriptor.value);
+          Zone._redefineProperty(opts.prototype, callback, descriptor);
+        }
       }
     });
     return _registerElement.apply(document, [name, opts]);
