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

Merge pull request #190 from wraithan/fix-ls-txt

Browse Source 
Fix some stuff with ls() and cat
This commit is contained in:
danielyxie 2018-02-16 15:03:06 -06:00 committed by GitHub
commit d37e8f1d5f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 24 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
doc/source/netscriptfunctions.rst
View File

@ -346,9 +346,10 @@ scp
ls ls
^^ ^^
.. js:function:: ls(hostname/ip) .. js:function:: ls(hostname/ip, [grep])
:param string hostname/ip: Hostname or IP of the target server :param string hostname/ip: Hostname or IP of the target server
:param string grep: a substring to search for in the filename.
Returns an array with the filenames of all files on the specified server (as strings). The returned array Returns an array with the filenames of all files on the specified server (as strings). The returned array
is sorted in alphabetic order is sorted in alphabetic order

2
src/Message.js
View File

@ -42,7 +42,7 @@ function showMessage(msg) {
var txt = "Message received from unknown sender: <br><br>" + var txt = "Message received from unknown sender: <br><br>" +
"<i>" + msg.msg + "</i><br><br>" + "<i>" + msg.msg + "</i><br><br>" +
"This message was saved as " + msg.filename + " onto your home computer."; "This message was saved as " + msg.filename + " onto your home computer.";
dialogBoxCreate(txt); dialogBoxCreate(txt, true);
} }
//Adds a message to a server //Adds a message to a server

10
src/NetscriptFunctions.js
View File

@ -834,6 +834,16 @@ function NetscriptFunctions(workerScript) {
} }
} }
for (var i = 0; i < server.textFiles.length; i++) {
if (filter) {
if (server.textFiles[i].fn.includes(filter)) {
allFiles.push(server.textFiles[i].fn);
}
} else {
allFiles.push(server.textFiles[i].fn);
}
}
//Sort the files alphabetically then print each //Sort the files alphabetically then print each
allFiles.sort(); allFiles.sort();
return allFiles; return allFiles;

14
utils/DialogBox.js
View File

@ -32,7 +32,7 @@ $(document).on('click', '.dialog-box-close-button', function( event ) {
var dialogBoxOpened = false; var dialogBoxOpened = false;
function dialogBoxCreate(txt) { function dialogBoxCreate(txt, preformatted) {
var container = document.createElement("div"); var container = document.createElement("div");
container.setAttribute("class", "dialog-box-container"); container.setAttribute("class", "dialog-box-container");
@ -43,8 +43,16 @@ function dialogBoxCreate(txt) {
closeButton.setAttribute("class", "dialog-box-close-button"); closeButton.setAttribute("class", "dialog-box-close-button");
closeButton.innerHTML = "&times;" closeButton.innerHTML = "&times;"
var textE = document.createElement("p"); var textE;
textE.innerHTML = txt.replace(/(?:\r\n|\r|\n)/g, '<br>'); if (preformatted) {
// For text files as they are often computed data that
// shouldn't be wrapped and should retain tabstops.
textE = document.createElement("pre");
textE.innerHTML = txt;
} else {
textE = document.createElement("p");
textE.innerHTML = txt.replace(/(?:\r\n|\r|\n)/g, '<br>');
}
content.appendChild(closeButton); content.appendChild(closeButton);
content.appendChild(textE); content.appendChild(textE);