Use shim blob with importScripts to use CORS for Worker
This commit is contained in:
parent
d226ea067b
commit
f779c2e8c5
1 changed files with 33 additions and 2 deletions
|
|
@ -57,7 +57,21 @@ var WorkerClient = function(topLevelNamespaces, mod, classname) {
|
|||
});
|
||||
}
|
||||
|
||||
this.$worker = new Worker(workerUrl);
|
||||
try {
|
||||
this.$worker = new Worker(workerUrl);
|
||||
} catch ( e ) {
|
||||
if ( e instanceof DOMException ) {
|
||||
// Likely same origin problem. Use importScripts from a shim Worker
|
||||
var blob = this.blobWorker(workerUrl),
|
||||
URL = URL || webkitURL,
|
||||
blobURL = URL.createObjectURL(blob);
|
||||
|
||||
this.$worker = new Worker(blobURL);
|
||||
URL.revokeObjectURL(blobURL);
|
||||
} else {
|
||||
throw e;
|
||||
}
|
||||
}
|
||||
this.$worker.postMessage({
|
||||
init : true,
|
||||
tlns: tlns,
|
||||
|
|
@ -163,7 +177,24 @@ var WorkerClient = function(topLevelNamespaces, mod, classname) {
|
|||
this.call("setValue", [this.$doc.getValue()]);
|
||||
} else
|
||||
this.emit("change", {data: q});
|
||||
}
|
||||
};
|
||||
|
||||
this.blobWorker = function(workerUrl) {
|
||||
var script = 'importScripts("' + workerUrl + '");',
|
||||
blob;
|
||||
try {
|
||||
blob = new Blob(
|
||||
[script],
|
||||
{ 'type' : 'application/javascript' }
|
||||
);
|
||||
} catch (e) { // Backwards-compatibility
|
||||
var BlobBuilder = window.BlobBuilder || window.WebKitBlobBuilder || window.MozBlobBuilder,
|
||||
blobBuilder = new BlobBuilder();
|
||||
blobBuilder.append(script);
|
||||
blob = blobBuilder.getBlob('application/javascript');
|
||||
}
|
||||
return blob;
|
||||
};
|
||||
|
||||
}).call(WorkerClient.prototype);
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue