Moved ajax request out of worker

master
Qvazar 2015-08-30 11:55:41 +02:00
rodzic 4d871a39f5
commit c234d251c8
2 zmienionych plików z 22 dodań i 27 usunięć

Wyświetl plik

@ -1,7 +1,11 @@
/* globals postMessage: false, DataView: false, self: false */
/* globals postMessage: false, DataView: false, self: false, onmessage: true */
/* jshint -W097 */
"use strict";
onmessage = function(e) {
postMessage("test");
};
self.onmessage = function(msg) {
postLog("info", "Received message.");
try {
@ -158,6 +162,4 @@ TarFileStream.prototype = {
return file;
}
};
postMessage({ type: "ready" });
};

Wyświetl plik

@ -99,25 +99,6 @@ function untar(source, options) {
var worker = new Worker(workerScriptUri);
function initWorker() {
// Is source a string? Then assume it's a URL and download it.
if (typeof source === "string") {
loadArrayBuffer(source).then(
function(buffer) {
console.info("Loaded tar file, extracting.");
worker.postMessage({ type: "extract", buffer: buffer }, [buffer]);
},
function(err) {
onError(err);
reject(err);
}
);
} else {
console.info("Extracting tar file.");
worker.postMessage({ type: "extract", buffer: source }, [source]);
}
}
var files = [];
var msgData;
@ -125,10 +106,6 @@ function untar(source, options) {
message = message.data;
switch (message.type) {
case "ready":
console.info("Worker is ready.");
initWorker();
break;
case "log":
console[message.data.level]("Worker: " + message.data.msg);
break;
@ -156,6 +133,22 @@ function untar(source, options) {
break;
}
};
if (typeof source === "string") {
loadArrayBuffer(source).then(
function(buffer) {
console.info("Loaded tar file, sending to worker for extraction.");
worker.postMessage({ type: "extract", buffer: buffer }, [buffer]);
},
function(err) {
onError(err);
reject(err);
}
);
} else {
console.info("Sending tar file to worker for extraction.");
worker.postMessage({ type: "extract", buffer: source }, [source]);
}
});
}