felixfoertsch/bitburner-src
1
0
Fork 0
mirror of https://github.com/bitburner-official/bitburner-src.git synced 2026-04-17 23:08:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' into ns2_recompile_stale_deps

Browse Source
This commit is contained in:
J
2019-06-02 23:03:20 -04:00
committed by GitHub
parent d45689c7df e5e3fec1a9
commit 8817d179c6
2 changed files with 22 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/NetscriptJSEvaluator.js
View File

@@ -38,10 +38,10 @@ export async function executeJSScript(scripts = [], workerScript) {
// load fully dynamic content. So we hide the import from webpack // load fully dynamic content. So we hide the import from webpack
// by placing it inside an eval call. // by placing it inside an eval call.
urls = _getScriptUrls(script, scripts, []); urls = _getScriptUrls(script, scripts, []);
script.module = await eval('import(urls[urls.length - 1].url)'); script.module = new Promise(resolve => resolve(eval('import(urls[urls.length - 1].url)')));
script.dependencies = urls.map(u => u.filename); script.dependencies = urls.map(u => u.filename);
} }
loadedModule = script.module; loadedModule = await script.module;
let ns = workerScript.env.vars; let ns = workerScript.env.vars;

35
utils/DialogBox.js
View File

@@ -1,3 +1,5 @@
import { KEY } from "./helpers/keyCodes";
/** /**
* Create and display a pop-up dialog box. * Create and display a pop-up dialog box.
* This dialog box does not allow for any interaction and should close when clicking * This dialog box does not allow for any interaction and should close when clicking
@@ -9,28 +11,31 @@ let dialogBoxes = [];
$(document).click(function(event) { $(document).click(function(event) {
if (dialogBoxOpened && dialogBoxes.length >= 1) { if (dialogBoxOpened && dialogBoxes.length >= 1) {
if (!$(event.target).closest(dialogBoxes[0]).length){ if (!$(event.target).closest(dialogBoxes[0]).length){
dialogBoxes[0].remove(); closeTopmostDialogBox();
dialogBoxes.splice(0, 1);
if (dialogBoxes.length == 0) {
dialogBoxOpened = false;
} else {
dialogBoxes[0].style.visibility = "visible";
}
} }
} }
}); });
function closeTopmostDialogBox() {
if (!dialogBoxOpened || dialogBoxes.length === 0) return;
dialogBoxes[0].remove();
dialogBoxes.shift();
if (dialogBoxes.length == 0) {
dialogBoxOpened = false;
} else {
dialogBoxes[0].style.visibility = "visible";
}
}
// Dialog box close buttons // Dialog box close buttons
$(document).on('click', '.dialog-box-close-button', function( event ) { $(document).on('click', '.dialog-box-close-button', function( event ) {
if (dialogBoxOpened && dialogBoxes.length >= 1) { closeTopmostDialogBox();
dialogBoxes[0].remove(); });
dialogBoxes.splice(0, 1);
if (dialogBoxes.length == 0) { document.addEventListener("keydown", function (event) {
dialogBoxOpened = false; if (event.keyCode == KEY.ESC && dialogBoxOpened) {
} else { closeTopmostDialogBox();
dialogBoxes[0].style.visibility = "visible"; event.preventDefault();
}
} }
}); });