From dea9400a2adfbde834f8c4e27a219b731bdb27fe Mon Sep 17 00:00:00 2001
From: Yat Ho <lagoho7@gmail.com>
Date: Sun, 4 Feb 2024 12:14:51 +0800
Subject: [PATCH] chore: backport recent WebUI fixes (#6563)

* fix: update WebUI build instructions to use `dataurl` loader for images (#6430)

(cherry picked from commit 9932f567fbe7ff80fe25fa4d80c983b49c3281d2)

* fix: always use location of selected torrents in WebUI set location dialogue (#6334)

(cherry picked from commit 71de532e0c9a0bfb71e157be71f8d6cf50e98793)
---
 web/README.md          | 4 ++--
 web/src/move-dialog.js | 7 +------
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/web/README.md b/web/README.md
index f9a01bee8..03ed58ac5 100644
--- a/web/README.md
+++ b/web/README.md
@@ -25,8 +25,8 @@ $ esbuild \
   --allow-overwrite \
   --bundle \
   --legal-comments=external \
-  --loader:.png=binary \
-  --loader:.svg=binary \
+  --loader:.png=dataurl \
+  --loader:.svg=dataurl \
   --minify \
   --outfile=public_html/transmission-app.js \
   src/main.js
diff --git a/web/src/move-dialog.js b/web/src/move-dialog.js
index c38211a3e..9d0c6ed09 100644
--- a/web/src/move-dialog.js
+++ b/web/src/move-dialog.js
@@ -3,8 +3,6 @@
    or any future license endorsed by Mnemosyne LLC.
    License text can be found in the licenses/ folder. */
 
-let default_path = '';
-
 import { createDialogContainer } from './utils.js';
 
 export class MoveDialog extends EventTarget {
@@ -25,13 +23,11 @@ export class MoveDialog extends EventTarget {
       return;
     }
 
-    default_path = default_path || torrents[0].getDownloadDir();
-
     this.torrents = torrents;
     this.elements = MoveDialog._create();
     this.elements.confirm.addEventListener('click', () => this._onConfirm());
     this.elements.dismiss.addEventListener('click', () => this._onDismiss());
-    this.elements.entry.value = default_path;
+    this.elements.entry.value = torrents[0].getDownloadDir();
     document.body.append(this.elements.root);
 
     this.elements.entry.focus();
@@ -55,7 +51,6 @@ export class MoveDialog extends EventTarget {
   _onConfirm() {
     const ids = this.torrents.map((tor) => tor.getId());
     const path = this.elements.entry.value.trim();
-    default_path = path;
     this.remote.moveTorrents(ids, path);
     this.close();
   }