Merge pull request #21 from jamiefaye/dev

Bug fixes
jamiefaye · Nov 11, 2018 · 5433793 · 5433793
2 parents df9f9af + 88a6ca9
commit 5433793
Show file tree

Hide file tree

Showing 10 changed files with 37 additions and 659 deletions.
diff --git a/DR/FTF/List.js b/DR/FTF/List.js
diff --git a/DR/xmlView/viewXML.htm b/DR/xmlView/viewXML.htm
@@ -6,12 +6,14 @@
 		<title>Downrush XML Viewer</title>
 <!-- https://stackoverflow.com/questions/951791/javascript-global-error-handling -->
 <script type="text/javascript">
+
  window.onerror = function(msg, url, line, col, error) {
    var extra = !col ? '' : '\ncolumn: ' + col;
    extra += !error ? '' : '\nerror: ' + error;
    alert("Error: " + msg + "\nurl: " + url + "\nline: " + line + extra);
    return true;
 };
+
 </script>
 <div id="npoptemp" style="display: none;"></div>
 <link rel="stylesheet" href="edit.css">

diff --git a/FTF/src/FileBrowser.js b/FTF/src/FileBrowser.js
@@ -237,7 +237,8 @@ case 2:
 	}
 	let that = this;
 	let file = zonkList.shift();
-	let url = "/upload.cgi?DEL=" + file;
+	let fileEnc = encodeURIComponent(file);
+	let url = "/upload.cgi?DEL=" + fileEnc;
 	// Capture closure.
 	let zonkFunc = function (status) {
 		if (!status) {// Pass failure back up the stack.
@@ -280,7 +281,9 @@ case 2:
 
   deleteFiles()
 {
-	var boxList = this.getCheckedList(this.currentPath + '/');
+	let boxPath = this.currentPath;
+	if (boxPath !== '/') boxPath += '/';
+	var boxList = this.getCheckedList(boxPath);
 	var alertList = boxList.join('\n');
 	var result = confirm( "Delete "+ alertList + "?" );
 	let that = this;
@@ -307,7 +310,9 @@ case 2:
 }
 
   renameFile() {
-	let boxList = this.getCheckedList(this.currentPath + '/');
+  	let boxPath = this.currentPath;
+	if (boxPath !== '/') boxPath += '/';
+	let boxList = this.getCheckedList(boxPath);
 	if (boxList.length === 0) {
 		alert("Please select a file to rename or move using the checkbox");
 		return;
@@ -492,7 +497,7 @@ case 2:
 
 	$('#uploadbut').click(e=>{that.upload()});
 	$('#newdirbut').click(e=>{that.NewDirectory()});
-	$('#deletebit').click(e=>{that.deleteFiles()});
+	$('#deletebut').click(e=>{that.deleteFiles()});
 	$('#renamebut').click(e=>{that.renameFile()});
 	$('#reloadbut').click(e=>{that.reload_list()});
 

diff --git a/FTF/src/List.js b/FTF/src/List.js
@@ -137,7 +137,7 @@ let fileManagerHTML =`<html>
 			<br>Drag and drop files and folders to upload here.<br><div id="statind"></div>
 			</div>
 			<input id='newdirbut' type="button" value="New Directory">
-			<input id='deletebit' type="button" value="Remove Checked Files">
+			<input id='deletebut' type="button" value="Remove Checked Files">
 			<input id='renamebut' type="button" value="Rename Checked File">
 			<hr>
 			<div class = 'nobord'>