Catch thrown errors and fall back to a non-webworker solution.

Sebmaster · Sebmaster · commit e063e2e699e3 · 2013-02-25T13:27:52.000+01:00
This fixes parallel-js#8 and (for now) parallel-js#11, although the fix for parallel-js#11 should actually be a wrapper script.
diff --git a/parallel.js b/parallel.js
@@ -60,24 +60,34 @@ var Parallel = (function  () {
 
         var wrap = _.compose(wrapFunctions, wrapFiles, wrapMain);
 
-        var RemoteRef = function (fn) {
-            var str = wrap(fn),
-                blob = new Blob([str], { type: 'text/javascript' }),
-                url = URL.createObjectURL(blob),
-                worker = new Worker(url);
-
-            worker.onmessage = _.bind(this.onWorkerMsg, worker);
-
-            this.worker = worker;
-            this.worker.ref = this;
+        var RemoteRef = function (fn, args) {
+            try {
+                var str = wrap(fn),
+                    blob = new Blob([str], { type: 'text/javascript' }),
+                    url = URL.createObjectURL(blob),
+                    worker = new Worker(url);
+    
+                worker.onmessage = _.bind(this.onWorkerMsg, this);
+    
+                this.worker = worker;
+                this.worker.ref = this;
+                
+                if (isNode) {
+                    this.worker.postMessage(JSON.stringify([].concat(args)));
+                } else {
+                    this.worker.postMessage([].concat(args));
+                }
+            } catch (e) {
+                this.onWorkerMsg({data: fn.apply(window, args)});
+            }
         };
 
         RemoteRef.prototype.onWorkerMsg = function (e) {
             if (isNode) {
-                this.ref.data = JSON.parse(e.data);
-                this.ref.worker.terminate();
+                this.data = JSON.parse(e.data);
+                this.worker.terminate();
             } else {
-                this.ref.data = e.data;
+                this.data = e.data;
             }
         };
 
@@ -97,12 +107,7 @@ var Parallel = (function  () {
         };
 
         return function (fn, args) {
-            var r = new RemoteRef(fn);
-            if (isNode) {
-                r.worker.postMessage(JSON.stringify([].concat(args)));
-            } else {
-                r.worker.postMessage([].concat(args));
-            }
+            var r = new RemoteRef(fn, args);
 
             return r;
         };
