Merge pull request #241 from danielyxie/dev

Fix bug where sometimes Active Scripts UI wouldnt fully update after …
This commit is contained in:
danielyxie 2018-05-11 20:55:55 -05:00 committed by GitHub
commit 1df56cd76d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 9 additions and 9 deletions

@ -18521,7 +18521,7 @@ function prestigeWorkerScripts() {
Object(_ActiveScriptsUI_js__WEBPACK_IMPORTED_MODULE_0__["deleteActiveScriptsItem"])(workerScripts[i]);
workerScripts[i].env.stopFlag = true;
}
Object(_ActiveScriptsUI_js__WEBPACK_IMPORTED_MODULE_0__["updateActiveScriptsItems"])(); //Force UI to update
Object(_ActiveScriptsUI_js__WEBPACK_IMPORTED_MODULE_0__["updateActiveScriptsItems"])(5000); //Force UI to update
workerScripts.length = 0;
}
@ -55109,10 +55109,10 @@ function deleteActiveScriptsItem(workerscript) {
}
//Update the ActiveScriptsItems array
function updateActiveScriptsItems() {
function updateActiveScriptsItems(maxTasks=100) {
//Run tasks that need to be done sequentially (adding items, creating/deleting server panels)
//We'll limit this to 50 at a time in case someone decides to start a bunch of scripts all at once...
let numTasks = Math.min(100, ActiveScriptsTasks.length);
let numTasks = Math.min(maxTasks, ActiveScriptsTasks.length);
for (let i = 0; i < numTasks; ++i) {
let task = ActiveScriptsTasks.shift();
try {

@ -18521,7 +18521,7 @@ function prestigeWorkerScripts() {
Object(_ActiveScriptsUI_js__WEBPACK_IMPORTED_MODULE_0__["deleteActiveScriptsItem"])(workerScripts[i]);
workerScripts[i].env.stopFlag = true;
}
Object(_ActiveScriptsUI_js__WEBPACK_IMPORTED_MODULE_0__["updateActiveScriptsItems"])(); //Force UI to update
Object(_ActiveScriptsUI_js__WEBPACK_IMPORTED_MODULE_0__["updateActiveScriptsItems"])(5000); //Force UI to update
workerScripts.length = 0;
}
@ -55109,10 +55109,10 @@ function deleteActiveScriptsItem(workerscript) {
}
//Update the ActiveScriptsItems array
function updateActiveScriptsItems() {
function updateActiveScriptsItems(maxTasks=100) {
//Run tasks that need to be done sequentially (adding items, creating/deleting server panels)
//We'll limit this to 50 at a time in case someone decides to start a bunch of scripts all at once...
let numTasks = Math.min(100, ActiveScriptsTasks.length);
let numTasks = Math.min(maxTasks, ActiveScriptsTasks.length);
for (let i = 0; i < numTasks; ++i) {
let task = ActiveScriptsTasks.shift();
try {

@ -182,10 +182,10 @@ function deleteActiveScriptsItem(workerscript) {
}
//Update the ActiveScriptsItems array
function updateActiveScriptsItems() {
function updateActiveScriptsItems(maxTasks=100) {
//Run tasks that need to be done sequentially (adding items, creating/deleting server panels)
//We'll limit this to 50 at a time in case someone decides to start a bunch of scripts all at once...
let numTasks = Math.min(100, ActiveScriptsTasks.length);
let numTasks = Math.min(maxTasks, ActiveScriptsTasks.length);
for (let i = 0; i < numTasks; ++i) {
let task = ActiveScriptsTasks.shift();
try {

@ -53,7 +53,7 @@ function prestigeWorkerScripts() {
deleteActiveScriptsItem(workerScripts[i]);
workerScripts[i].env.stopFlag = true;
}
updateActiveScriptsItems(); //Force UI to update
updateActiveScriptsItems(5000); //Force UI to update
workerScripts.length = 0;
}