Personal_mirrors/bitburner-src
1
0
Fork 0
mirror of https://github.com/bitburner-official/bitburner-src.git synced 2024-12-24 15:12:27 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #246 from danielyxie/dev

Browse Source 
scp Terminal command and Active Scripts UI (hopefully) bug fixes
This commit is contained in:
danielyxie 2018-05-12 20:23:33 -05:00 committed by GitHub
commit ae509cf50d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 580 additions and 589 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

419
dist/engine.bundle.js vendored
View File

File diff suppressed because one or more lines are too long

511
dist/tests.bundle.js vendored
View File

File diff suppressed because one or more lines are too long

7
src/ActiveScriptsUI.js
View File

@ -26,7 +26,6 @@ let ActiveScriptsUI = {};
let ActiveScriptsTasks = []; //Sequentially schedule the creation/deletion of UI elements let ActiveScriptsTasks = []; //Sequentially schedule the creation/deletion of UI elements
function createActiveScriptsServerPanel(server) { function createActiveScriptsServerPanel(server) {
ActiveScriptsTasks.push(function(server) {
let hostname = server.hostname; let hostname = server.hostname;
var activeScriptsList = document.getElementById("active-scripts-list"); var activeScriptsList = document.getElementById("active-scripts-list");
@ -55,13 +54,11 @@ function createActiveScriptsServerPanel(server) {
}; };
return li; return li;
}.bind(null, server));
} }
//Deletes the info for a particular server (Dropdown header + Panel with all info) //Deletes the info for a particular server (Dropdown header + Panel with all info)
//in the Active Scripts page if it exists //in the Active Scripts page if it exists
function deleteActiveScriptsServerPanel(server) { function deleteActiveScriptsServerPanel(server) {
ActiveScriptsTasks.push(function(server) {
let hostname = server.hostname; let hostname = server.hostname;
if (ActiveScriptsUI[hostname] == null) { if (ActiveScriptsUI[hostname] == null) {
console.log("WARNING: Tried to delete non-existent Active Scripts Server panel. Aborting"); console.log("WARNING: Tried to delete non-existent Active Scripts Server panel. Aborting");
@ -77,7 +74,6 @@ function deleteActiveScriptsServerPanel(server) {
removeElement(ActiveScriptsUI[hostname].panel); removeElement(ActiveScriptsUI[hostname].panel);
removeElement(ActiveScriptsUI[hostname].header); removeElement(ActiveScriptsUI[hostname].header);
delete ActiveScriptsUI[hostname]; delete ActiveScriptsUI[hostname];
}.bind(null, server));
} }
function addActiveScriptsItem(workerscript) { function addActiveScriptsItem(workerscript) {
@ -87,11 +83,12 @@ function addActiveScriptsItem(workerscript) {
return; return;
} }
let hostname = server.hostname; let hostname = server.hostname;
ActiveScriptsTasks.push(function(workerscript, hostname) {
if (ActiveScriptsUI[hostname] == null) { if (ActiveScriptsUI[hostname] == null) {
createActiveScriptsServerPanel(server); createActiveScriptsServerPanel(server);
} }
ActiveScriptsTasks.push(function(workerscript, hostname) {
//Create the unique identifier (key) for this script //Create the unique identifier (key) for this script
var itemNameArray = ["active", "scripts", hostname, workerscript.name]; var itemNameArray = ["active", "scripts", hostname, workerscript.name];
for (var i = 0; i < workerscript.args.length; ++i) { for (var i = 0; i < workerscript.args.length; ++i) {

2
src/NetscriptFunctions.js
View File

@ -1432,7 +1432,7 @@ function NetscriptFunctions(workerScript) {
} }
var stock = SymbolToStockMap[symbol]; var stock = SymbolToStockMap[symbol];
if (stock == null) { if (stock == null) {
throw makeRuntimeRejectMsg(workerScript, "Invalid stock symbol passed into getStockPrice()"); throw makeRuntimeRejectMsg(workerScript, "Invalid stock symbol passed into getStockPosition()");
} }
return [stock.playerShares, stock.playerAvgPx, stock.playerShortShares, stock.playerAvgShortPx]; return [stock.playerShares, stock.playerAvgPx, stock.playerShortShares, stock.playerAvgShortPx];
}, },

2
src/Terminal.js
View File

@ -1379,7 +1379,7 @@ let Terminal = {
return; return;
} }
var scriptname = args[0]; var scriptname = args[0];
if (!scriptname.endsWith(".lit") && !isScriptFilename(scriptName) && if (!scriptname.endsWith(".lit") && !isScriptFilename(scriptname) &&
!scriptname.endsWith(".txt")){ !scriptname.endsWith(".txt")){
post("Error: scp only works for .script, .txt, and .lit files"); post("Error: scp only works for .script, .txt, and .lit files");
return; return;