Fetch descriptor from prototype chain

kingcody · Apr 5, 2015 · 8caeda7 · 8caeda7
1 parent 3a3dae4
commit 8caeda7
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/zone.js b/zone.js
@@ -644,11 +644,18 @@ Zone.patchRegisterElement = function () {
     'detachedCallback',
     'attributeChangedCallback'
   ];
+  var getPropertyDescriptor = function(obj, prop) {
+    var descriptor;
+    while (obj && !(descriptor = Object.getOwnPropertyDescriptor(obj, prop))) {
+      obj = obj.__proto__;
+    }
+    return descriptor;
+  };
   document.registerElement = function (name, opts) {
     callbacks.forEach(function (callback) {
       if (opts.prototype[callback]) {
-        var descriptor = Object.getOwnPropertyDescriptor(opts.prototype, callback);
-        if (descriptor.value) {
+        var descriptor = getPropertyDescriptor(opts.prototype, callback);
+        if (descriptor && descriptor.value) {
           descriptor.value = zone.bind(descriptor.value || opts.prototype[callback]);
           Zone._redefineProperty(opts.prototype, callback, descriptor);
         }