Use CSS to indicate the importance of whitespace rather than replacin…

…g with nbsp's (#2780) Closes #2779 Alternate fix for #2757 Partially reverts #2768
Novik · Nov 11, 2024 · fc200ab · fc200ab
1 parent a9e0342
commit fc200ab
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/plugins/_getdir/_getdir.css b/plugins/_getdir/_getdir.css
@@ -18,6 +18,9 @@
   color: windowtext;
   padding: 0.15rem;
   text-wrap: nowrap;
+
+  /* whitespace here is deliberate, and should be shown as we set it */
+  white-space: pre;
 }
 .rmenuitem.active {
   color: highlighttext;

diff --git a/plugins/_getdir/init.js b/plugins/_getdir/init.js
@@ -121,16 +121,16 @@ theWebUI.rDirBrowser = class {
 
 	requestDir() {
 		$.ajax(
-			`plugins/_getdir/listdir.php?dir=${encodeURIComponent(this.edit.val().replace(/\u00a0/g, " "))}&time=${(new Date()).getTime()}${this.withFiles ? "&withfiles=1" : ""}`,
+			`plugins/_getdir/listdir.php?dir=${encodeURIComponent(this.edit.val())}&time=${(new Date()).getTime()}${this.withFiles ? "&withfiles=1" : ""}`,
 			{
 				success: (res) => {
 					this.frame.find(".filter-dir").val("").trigger("focus");
 					this.edit.val(res.path).data({cwd:res.path, previousValue:this.edit.val()}).change();
 					this.frame.find(".rmenuobj").remove();
 					this.frame.append(
 						$("<div>").addClass("rmenuobj").append(
-							...res.directories.map(ele => $("<div>").addClass("rmenuitem").text(ele.replace(/ /g, "\u00a0") + "/")),
-							...(this.withFiles ? res.files : []).map(ele => $("<div>").addClass("rmenuitem").text(ele.replace(/ /g, "\u00a0"))),
+							...res.directories.map(ele => $("<div>").addClass("rmenuitem").text(ele + "/")),
+							...(this.withFiles ? res.files : []).map(ele => $("<div>").addClass("rmenuitem").text(ele)),
 						),
 					);
 					this.frame.find(".rmenuitem").on(