From 7bddd9838c4dd7056a631f3d3d14982f72c1dab3 Mon Sep 17 00:00:00 2001
From: Til Schmitter <til.schmitter@gmail.com>
Date: Sun, 3 May 2026 23:34:55 +0200
Subject: [PATCH] demodalize up2k in wG folders

---
 copyparty/web/browser.html | 52 +++++++++++++++++++-------------------
 copyparty/web/browser.js   | 29 +++++++++++++++------
 2 files changed, 47 insertions(+), 34 deletions(-)

diff --git a/copyparty/web/browser.html b/copyparty/web/browser.html
index 0e93377f..b94296c1 100644
--- a/copyparty/web/browser.html
+++ b/copyparty/web/browser.html
@@ -136,6 +136,32 @@
 
 	<div id="pro" class="logue">{{ "" if sb_lg else logues[0] }}</div>
 
+	<div id="cfg" class="modal">
+		<a id="s_outside" class="closepane" href="#"></a>
+		<div id="s_content" class="modalcontent">
+			<a id="h_cfg" class="modalheader" href="#h_cfg"></a>
+			<div id="s_hor" class="modalsplit">
+				<div id="s_nav" class="splitsub"></div>
+				<div class="divider"></div>
+				<div id="s_list" class="opview splitsub"></div>
+			</div>
+			<a class="close btn" href="#">✕</a>
+		</div>
+	</div>
+
+	<div id="up2k" class="modal">
+		<a id="up_outside" class="closepane" href="#"></a>
+		<div id="up_content" class="modalcontent">
+			<a id="h_up2k" class="modalheader" href="#h_up2k">🚀 Upload</a>
+			<div id="up_hor" class="modalsplit">
+				<div id="op_up2k" class="opview splitsub"></div>
+				<div class="divider"></div>
+				<div id="up_info" class="splitsub"></div>
+			</div>
+			<a class="close btn" href="#">✕</a>
+		</div>
+	</div>
+
 	<div id="wtc" class="ghead"></div>
 	<table id="files">
 		<thead>
@@ -179,32 +205,6 @@
 	<div id="rcm" tabindex="0"></div>
 
 
-	<div id="cfg" class="modal">
-		<a id="s_outside" class="closepane" href="#"></a>
-		<div id="s_content" class="modalcontent">
-			<a id="h_cfg" class="modalheader" href="#h_cfg"></a>
-			<div id="s_hor" class="modalsplit">
-				<div id="s_nav" class="splitsub"></div>
-				<div class="divider"></div>
-				<div id="s_list" class="opview splitsub"></div>
-			</div>
-			<a class="close btn" href="#">✕</a>
-		</div>
-	</div>
-
-	<div id="up2k" class="modal">
-		<a id="up_outside" class="closepane" href="#"></a>
-		<div id="up_content" class="modalcontent">
-			<a id="h_up2k" class="modalheader" href="#h_up2k">🚀 Upload</a>
-			<div id="up_hor" class="modalsplit">
-				<div id="op_up2k" class="opview splitsub"></div>
-				<div class="divider"></div>
-				<div id="up_info" class="splitsub"></div>
-			</div>
-			<a class="close btn" href="#">✕</a>
-		</div>
-	</div>
-
 	<script>
 		var SR = "{{ r }}",
 			CGV1 = {{ cgv1 }},
diff --git a/copyparty/web/browser.js b/copyparty/web/browser.js
index 01f1f7b6..5d118d56 100644
--- a/copyparty/web/browser.js
+++ b/copyparty/web/browser.js
@@ -1141,10 +1141,14 @@ var bup = ebi('op_bup');
 ebi('bup_tgl').appendChild(bup);
 ebi('h_bup').onclick = function() {
 	var open = !clgot(bup, 'act');
-	if(open)
+	if(open){
+		location.hash = '#h_bup';
 		modaltoggle('bup', true);
-	else
+	}
+	else{
+		location.hash = '#h_up2k';
 		modaltoggle('up2k', true);
+	}
 	ebi('bup_tgl').open = !open;
 };
 
@@ -1582,12 +1586,16 @@ function goto(dest) {
 		if (fn)
 			fn();
 	}
+	else{
+		if(location.hash.startsWith('#h_'))
+			location.hash = '#';
+	}
 
 	ebi('srchfolder_div').style.display = dest == 'search' ? 'block' : 'none';
 		
 	clmod(document.documentElement, 'op_open', dest);
 	// enables the use of keyboard page nav on modals
-	clmod(document.documentElement, 'noscroll', QS('.modal.vis'));
+	clmod(document.documentElement, 'noscroll', QS('.modal.vis') && QS('.modal.vis').style.position == 'fixed');
 
 	if (treectl)
 		treectl.onscroll();
@@ -1602,6 +1610,8 @@ window.onhashchange = function() {
 		console.log('closing modal due to hash');
 	}
 	if(a_modal && location.hash == '#h_' + a_modal.id){
+		if(a_modal.style.position != 'fixed')
+			return;
 		var m_header = QS('.modal.vis .modalheader');
 		if(m_header){
 			m_header.click();
@@ -1615,7 +1625,6 @@ window.onhashchange = function() {
 		var p_modal = header.closest('.modal');
 		if(!p_modal)
 			return;
-		console.log(p_modal)
 		if(!clgot(p_modal, 'vis')){
 			console.log('forcing modal open due to subheader hash');
 			modaltoggle(p_modal.id);
@@ -8767,9 +8776,8 @@ function apply_perms(res) {
 		var needed = o[a].getAttribute('data-perm').split(' ');
 		for (var b = 0; b < needed.length; b++) {
 			if (!has(perms, needed[b])) {
-				if(needed[b] == 'write')
-					enabled = false;
-				else
+				enabled = false;
+				if(needed[b] != 'write')
 					display = 'none';
 			}
 		}
@@ -8828,8 +8836,13 @@ function apply_perms(res) {
 
 	widget.setvis();
 	thegrid.setvis();
-	if (!have_read && have_write)
+	if (!have_read && have_write){
+		ebi('up2k').style.position = 'initial';
+		ebi('up_content').style.width = '100%';
+		ebi('up_content').style.margin = '0';
+
 		goto('up2k');
+	}
 }