fix(WebWorker): Patch WebSockets and XMLHttpRequest in WebWorker

jteplitz · jeffbcross · commit 9041a3a5d8ac · 2016-02-12T21:43:11.000-08:00
Closes #249
diff --git a/lib/patch/property-descriptor.ts b/lib/patch/property-descriptor.ts
@@ -5,25 +5,24 @@ import * as keys from '../keys';
 var eventNames = 'copy cut paste abort blur focus canplay canplaythrough change click contextmenu dblclick drag dragend dragenter dragleave dragover dragstart drop durationchange emptied ended input invalid keydown keypress keyup load loadeddata loadedmetadata loadstart message mousedown mouseenter mouseleave mousemove mouseout mouseover mouseup pause play playing progress ratechange reset scroll seeked seeking select show stalled submit suspend timeupdate volumechange waiting mozfullscreenchange mozfullscreenerror mozpointerlockchange mozpointerlockerror error webglcontextrestored webglcontextlost webglcontextcreationerror'.split(' ');
 
 export function apply() {
-  if (utils.isWebWorker()){
-    // on WebWorker so don't apply patch
-    return;
-  }
-
   var supportsWebSocket = typeof WebSocket !== 'undefined';
   if (canPatchViaPropertyDescriptor()) {
     // for browsers that we can patch the descriptor:  Chrome & Firefox
-    var onEventNames = eventNames.map(function (property) {
-      return 'on' + property;
-    });
-    utils.patchProperties(HTMLElement.prototype, onEventNames);
+    if (!utils.isWebWorker()){
+      var onEventNames = eventNames.map(function (property) {
+        return 'on' + property;
+      });
+      utils.patchProperties(HTMLElement.prototype, onEventNames);
+    }
     utils.patchProperties(XMLHttpRequest.prototype);
     if (supportsWebSocket) {
       utils.patchProperties(WebSocket.prototype);
     }
   } else {
     // Safari, Android browsers (Jelly Bean)
-    patchViaCapturingAllTheEvents();
+    if (!utils.isWebWorker()){
+      patchViaCapturingAllTheEvents();
+    }
     utils.patchClass('XMLHttpRequest');
     if (supportsWebSocket) {
       webSocketPatch.apply();
@@ -32,21 +31,22 @@ export function apply() {
 }
 
 function canPatchViaPropertyDescriptor() {
-  if (!Object.getOwnPropertyDescriptor(HTMLElement.prototype, 'onclick') && typeof Element !== 'undefined') {
+  if (!utils.isWebWorker() && !Object.getOwnPropertyDescriptor(HTMLElement.prototype, 'onclick')
+      && typeof Element !== 'undefined') {
     // WebKit https://bugs.webkit.org/show_bug.cgi?id=134364
     // IDL interface attributes are not configurable
     var desc = Object.getOwnPropertyDescriptor(Element.prototype, 'onclick');
     if (desc && !desc.configurable) return false;
   }
 
-  Object.defineProperty(HTMLElement.prototype, 'onclick', {
+  Object.defineProperty(XMLHttpRequest.prototype, 'onreadystatechange', {
     get: function () {
       return true;
     }
   });
-  var elt = document.createElement('div');
-  var result = !!elt.onclick;
-  Object.defineProperty(HTMLElement.prototype, 'onclick', {});
+  var req = new XMLHttpRequest();
+  var result = !!req.onreadystatechange;
+  Object.defineProperty(XMLHttpRequest.prototype, 'onreadystatechange', {});
   return result;
 };
 
