Fix status messages for baking

This commit is contained in:
j433866 2019-05-01 15:19:01 +01:00
parent 02bda3250b
commit 1cedc94652
3 changed files with 10 additions and 5 deletions

View File

@ -25,6 +25,7 @@ self.chef = new Chef();
self.OpModules = OpModules;
self.OperationConfig = OperationConfig;
self.inputNum = -1;
// Tell the app that the worker has loaded and is ready to operate
@ -94,6 +95,7 @@ async function bake(data) {
self.loadRequiredModules(data.recipeConfig);
try {
self.inputNum = data.inputNum;
const response = await self.chef.bake(
data.input, // The user's input
data.recipeConfig, // The configuration of the recipe
@ -127,6 +129,7 @@ async function bake(data) {
})
});
}
self.inputNum = -1;
}
@ -206,7 +209,8 @@ self.sendStatusMessage = function(msg) {
self.postMessage({
action: "statusMessage",
data: {
message: msg
message: msg,
inputNum: self.inputNum || -1
}
});
};

View File

@ -83,8 +83,7 @@ class OutputWaiter {
const newOutput = {
data: null,
inputNum: inputNum,
// statusMessage: `Input ${inputNum} has not been baked yet.`,
statusMessage: "",
statusMessage: `Input ${inputNum} has not been baked yet.`,
error: null,
status: "inactive"
};
@ -356,6 +355,9 @@ class OutputWaiter {
if (value) {
this.manager.controls.hideStaleIndicator();
// Don't add the bombe if it's already there!
if (animation.children.length > 0) return;
// Start a timer to add the Bombe to the DOM just before we make it
// visible so that there is no stuttering
this.appendBombeTimeout = setTimeout(function() {

View File

@ -169,7 +169,6 @@ class WorkerWaiter {
break;
case "statusMessage":
// Status message should be done per output
// log.error(r);
this.manager.output.updateOutputMessage(r.data.message, r.data.inputNum);
break;
case "optionUpdate":
@ -305,7 +304,7 @@ class WorkerWaiter {
log.debug(`Baking input ${nextInput.inputNum}.`);
this.manager.output.updateOutputStatus("baking", nextInput.inputNum);
this.manager.output.updateOutputMessage("Baking...", nextInput.inputNum);
this.manager.output.updateOutputMessage(`Baking input ${nextInput.inputNum}...`, nextInput.inputNum);
this.chefWorkers[workerIdx].inputNum = nextInput.inputNum;