From 5c8fed1b23196c0db8435a78a7ce217106fa0dbf Mon Sep 17 00:00:00 2001 From: "JiaLi.Passion" Date: Sat, 1 Apr 2017 14:07:44 +0900 Subject: [PATCH] fix(patch): fix #708, modify the canPatchDescriptor logic when browser don't provide onreadystatechange --- lib/browser/property-descriptor.ts | 47 +++++++++++++++++++++--------- 1 file changed, 34 insertions(+), 13 deletions(-) diff --git a/lib/browser/property-descriptor.ts b/lib/browser/property-descriptor.ts index 7b054436a..19d6ad7cb 100644 --- a/lib/browser/property-descriptor.ts +++ b/lib/browser/property-descriptor.ts @@ -67,19 +67,40 @@ function canPatchViaPropertyDescriptor() { // by default XMLHttpRequest.prototype.onreadystatechange is undefined // without adding enumerable and configurable will cause onreadystatechange // non-configurable - Object.defineProperty(XMLHttpRequest.prototype, 'onreadystatechange', { - enumerable: true, - configurable: true, - get: function() { - return true; - } - }); - const req = new XMLHttpRequest(); - const result = !!req.onreadystatechange; - // restore original desc - Object.defineProperty(XMLHttpRequest.prototype, 'onreadystatechange', xhrDesc || {}); - return result; -} + // and if XMLHttpRequest.prototype.onreadystatechange is undefined, + // we should set a real desc instead a fake one + if (xhrDesc) { + Object.defineProperty(XMLHttpRequest.prototype, 'onreadystatechange', { + enumerable: true, + configurable: true, + get: function() { + return true; + } + }); + const req = new XMLHttpRequest(); + const result = !!req.onreadystatechange; + // restore original desc + Object.defineProperty(XMLHttpRequest.prototype, 'onreadystatechange', xhrDesc || {}); + return result; + } else { + Object.defineProperty(XMLHttpRequest.prototype, 'onreadystatechange', { + enumerable: true, + configurable: true, + get: function() { + return this[zoneSymbol('fakeonreadystatechange')]; + }, + set: function(value) { + this[zoneSymbol('fakeonreadystatechange')] = value; + } + }); + const req = new XMLHttpRequest(); + const detectFunc = () => {}; + req.onreadystatechange = detectFunc; + const result = (req as any)[zoneSymbol('fakeonreadystatechange')] === detectFunc; + req.onreadystatechange = null; + return result; + } +}; const unboundKey = zoneSymbol('unbound');