From b54cb47b2e74ce988e6dd3e9de43bf96891debf6 Mon Sep 17 00:00:00 2001
From: ed <s@ocv.me>
Date: Tue, 7 Sep 2021 22:44:48 +0200
Subject: [PATCH] listen for filedrops in all tabs/modes

---
 README.md                | 14 ++++++++------
 copyparty/web/browser.js | 23 +++++++++++++++--------
 copyparty/web/up2k.js    |  3 +++
 3 files changed, 26 insertions(+), 14 deletions(-)

diff --git a/README.md b/README.md
index 874f7368..176d084f 100644
--- a/README.md
+++ b/README.md
@@ -35,8 +35,8 @@ turn your phone or raspi into a portable file server with resumable uploads/down
     * [navpane](#navpane) - switching between breadcrumbs or navpane
     * [thumbnails](#thumbnails) - press `g` to toggle grid-view instead of the file listing
     * [zip downloads](#zip-downloads) - download folders (or file selections) as `zip` or `tar` files
-    * [uploading](#uploading) - web-browsers can upload using `bup` and `up2k`
-        * [file-search](#file-search) - drop files/folders into up2k to see if they exist on the server
+    * [uploading](#uploading) - drag files/folders into the web-browser to upload
+        * [file-search](#file-search) - dropping files into the browser also lets you see if they exist on the server
         * [unpost](#unpost) - undo/delete accidental uploads
     * [file manager](#file-manager) - cut/paste, rename, and delete files/folders (if you have permission)
     * [batch rename](#batch-rename) - select some files and press `F2` to bring up the rename UI
@@ -339,11 +339,13 @@ you can also zip a selection of files or folders by clicking them in the browser
 
 ## uploading
 
-web-browsers can upload using `bup` and `up2k`:
+drag files/folders into the web-browser to upload
+
+this initiates an upload using `up2k`; there are two uploaders available:
 * `[🎈] bup`, the basic uploader, supports almost every browser since netscape 4.0
 * `[🚀] up2k`, the fancy one
 
-you can undo/delete uploads using `[🧯]` [unpost](#unpost)
+you can also undo/delete uploads by using `[🧯]` [unpost](#unpost)
 
 up2k has several advantages:
 * you can drop folders into the browser (files are added recursively)
@@ -384,11 +386,11 @@ if you are resuming a massive upload and want to skip hashing the files which al
 
 ### file-search
 
-drop files/folders into up2k to see if they exist on the server
+dropping files into the browser also lets you see if they exist on the server
 
 ![copyparty-fsearch-fs8](https://user-images.githubusercontent.com/241032/129635361-c79286f0-b8f1-440e-aaf4-6e929428fac9.png)
 
-open the `[🚀 up2k]` tab and drag/drop files into the browser; you will see two dropzones: `Upload` and `Search`
+when you drag/drop files into the browser, you will see two dropzones: `Upload` and `Search`
 
 > on a phone? toggle the `[🔎]` switch green before tapping the big yellow Search button to select your files
 
diff --git a/copyparty/web/browser.js b/copyparty/web/browser.js
index 49eb3407..65259c81 100644
--- a/copyparty/web/browser.js
+++ b/copyparty/web/browser.js
@@ -129,17 +129,24 @@ ebi('op_up2k').innerHTML = (
 
 	'<p id="u2flagblock"><b>the files were added to the queue</b><br />however there is a busy up2k in another browser tab,<br />so waiting for that to finish first</p>\n' +
 	'<p id="u2foot"></p>\n' +
-	'<p id="u2footfoot" data-perm="write">( you can use the <a href="#" id="u2nope">basic uploader</a> if you don\'t need lastmod timestamps, resumable uploads, or progress bars )</p>\n' +
-
-	'<div id="drops">\n' +
-	'	<div class="dropdesc" id="up_zd"><div>🚀 Upload<br /><span></span></div></div>\n' +
-	'	<div class="dropdesc" id="srch_zd"><div>🔎 Search<br /><span></span></div></div>\n' +
-	'	<div class="dropzone" id="up_dz" v="up_zd"></div>\n' +
-	'	<div class="dropzone" id="srch_dz" v="srch_zd"></div>\n' +
-	'</div>'
+	'<p id="u2footfoot" data-perm="write">( you can use the <a href="#" id="u2nope">basic uploader</a> if you don\'t need lastmod timestamps, resumable uploads, or progress bars )</p>'
 );
 
 
+(function () {
+	var o = mknod('div');
+	o.innerHTML = (
+		'<div id="drops">\n' +
+		'	<div class="dropdesc" id="up_zd"><div>🚀 Upload<br /><span></span></div></div>\n' +
+		'	<div class="dropdesc" id="srch_zd"><div>🔎 Search<br /><span></span></div></div>\n' +
+		'	<div class="dropzone" id="up_dz" v="up_zd"></div>\n' +
+		'	<div class="dropzone" id="srch_dz" v="srch_zd"></div>\n' +
+		'</div>'
+	);
+	document.body.appendChild(o);
+})();
+
+
 // config panel
 ebi('op_cfg').innerHTML = (
 	'<div>\n' +
diff --git a/copyparty/web/up2k.js b/copyparty/web/up2k.js
index d439353f..234085ff 100644
--- a/copyparty/web/up2k.js
+++ b/copyparty/web/up2k.js
@@ -723,6 +723,9 @@ function up2k_init(subtle) {
             tgl_fsearch();
         }
 
+        if (!QS('#op_up2k.act'))
+            goto('up2k');
+
         var files,
             is_itemlist = false;