From fc200abb43b25855d5ea50a3f76f5f2567c47a39 Mon Sep 17 00:00:00 2001 From: Anthony Ryan Date: Mon, 11 Nov 2024 11:00:48 -0500 Subject: [PATCH] Use CSS to indicate the importance of whitespace rather than replacing with nbsp's (#2780) Closes #2779 Alternate fix for #2757 Partially reverts #2768 --- plugins/_getdir/_getdir.css | 3 +++ plugins/_getdir/init.js | 6 +++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/plugins/_getdir/_getdir.css b/plugins/_getdir/_getdir.css index 6b2593865..06acd6057 100644 --- 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 index eba4822b8..f22e41f42 100644 --- a/plugins/_getdir/init.js +++ b/plugins/_getdir/init.js @@ -121,7 +121,7 @@ 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"); @@ -129,8 +129,8 @@ theWebUI.rDirBrowser = class { this.frame.find(".rmenuobj").remove(); this.frame.append( $("
").addClass("rmenuobj").append( - ...res.directories.map(ele => $("
").addClass("rmenuitem").text(ele.replace(/ /g, "\u00a0") + "/")), - ...(this.withFiles ? res.files : []).map(ele => $("
").addClass("rmenuitem").text(ele.replace(/ /g, "\u00a0"))), + ...res.directories.map(ele => $("
").addClass("rmenuitem").text(ele + "/")), + ...(this.withFiles ? res.files : []).map(ele => $("
").addClass("rmenuitem").text(ele)), ), ); this.frame.find(".rmenuitem").on(