mirrors/copyparty
1
0
Fork 0
mirror of https://github.com/9001/copyparty.git synced 2026-01-12 07:44:08 -07:00
Code Issues Actions Packages Projects Releases Wiki Activity

rcm: fixes;

Browse source 
* reload with ?ls
* menu positioning
* close with ESC
This commit is contained in:
ed 2026-01-01 14:33:56 +01:00
parent 82c496092f
commit 05a4472075
2 changed files with 26 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
copyparty/web/browser.js
View file

@ -695,7 +695,7 @@ for (var a = 0; a < LANGN.length; a++)
function langtest() { function langtest() {
var n = LANGS.length - 1; var n = LANGS.length - 1;
for (var a = 1; a < LANGS.length; a++) for (var a = 1; a < LANGS.length; a++)
import_js(SR + '/.cpr/tl/' + LANGS[a] + '.js', function () { if (!--n) langtest2(); }); import_js(SR + '/.cpr/tl/' + LANGS[a] + '.js', function () { if (!--n) langtest2(); });
} }
function langtest2() { function langtest2() {
@ -1034,7 +1034,7 @@ ebi('rcm').innerHTML = (
'<a href="#" id="rcpy">' + L.rc_cpy + '</a>' + '<a href="#" id="rcpy">' + L.rc_cpy + '</a>' +
(has(perms, "write") ? (has(perms, "write") ?
'<a href="#" id="rpst">' + L.rc_pst + '</a>' + '<a href="#" id="rpst">' + L.rc_pst + '</a>' +
'<div id="rs3" class="sep"></div>' + '<div id="rs3" class="sep"></div>' +
'<a href="#" id="rnfo">' + L.rc_nfo + '</a>' + '<a href="#" id="rnfo">' + L.rc_nfo + '</a>' +
'<a href="#" id="rnfi">' + L.rc_nfi + '</a>' '<a href="#" id="rnfi">' + L.rc_nfi + '</a>'
: '') + : '') +
@ -6022,6 +6022,9 @@ var ahotkeys = function (e) {
if (ebi('hkhelp')) if (ebi('hkhelp'))
return qsr('#hkhelp'); return qsr('#hkhelp');
if (ebi('rcm').style.display)
return rcm.hide();
if (toast.visible) if (toast.visible)
return toast.hide(); return toast.hide();
@ -9463,7 +9466,7 @@ var rcm = (function () {
}; };
function mktemp(is_dir) { function mktemp(is_dir) {
var row = mknod('tr', 'temp', var row = mknod('tr', 'temp',
'<td>-new-</td>' + '<td>-new-</td>' +
'<td colspan="' + (QSA("#files thead th").length - 1) + '"><input id="tempname" class="i" type="text" placeholder="' + (is_dir ? 'Folder' : "File") + ' Name"></td>' '<td colspan="' + (QSA("#files thead th").length - 1) + '"><input id="tempname" class="i" type="text" placeholder="' + (is_dir ? 'Folder' : "File") + ' Name"></td>'
); );
@ -9484,8 +9487,7 @@ var rcm = (function () {
return toast.err(3, "a " + (is_dir ? "folder" : "file") + " with that name already exists."); return toast.err(3, "a " + (is_dir ? "folder" : "file") + " with that name already exists.");
if (req.status < 200 || req.status > 399) if (req.status < 200 || req.status > 399)
return toast.err(3, "couldn't create " + (is_dir ? "folder" : "file") + ": <br><code>" + esc(req.responseText) + '</code>'); return toast.err(3, "couldn't create " + (is_dir ? "folder" : "file") + ": <br><code>" + esc(req.responseText) + '</code>');
treectl.goto();
location.reload();
}; };
req.send(data); req.send(data);
} }
@ -9570,10 +9572,10 @@ var rcm = (function () {
default: default:
console.warn('Invalid rcm option "' + e.target.id + '"'); console.warn('Invalid rcm option "' + e.target.id + '"');
} }
hide(true); r.hide(true);
}; };
} }
function show(x, y, target) { function show(x, y, target) {
selFile.elem = selFile.type = selFile.path = selFile.id = selFile.relpath = null; selFile.elem = selFile.type = selFile.path = selFile.id = selFile.relpath = null;
selFile.no_dsel = false; selFile.no_dsel = false;
@ -9621,7 +9623,7 @@ var rcm = (function () {
menu.focus(); menu.focus();
} }
function hide(force) { r.hide = function (force) {
if (!menu.style.display || (!force && menu.contains(document.activeElement))) if (!menu.style.display || (!force && menu.contains(document.activeElement)))
return; return;
if (selFile.elem && !selFile.no_dsel) if (selFile.elem && !selFile.no_dsel)
@ -9633,16 +9635,16 @@ var rcm = (function () {
ebi('wrap').oncontextmenu = function(e) { ebi('wrap').oncontextmenu = function(e) {
if (thegrid.en || !r.enabled || e.shiftKey || menu.style.display) { if (thegrid.en || !r.enabled || e.shiftKey || menu.style.display) {
hide(true); r.hide(true);
return true; return true;
} }
else { else {
ev(e); ev(e);
show(e.clientX, e.clientY, e.target); show(xscroll() + e.clientX, yscroll() + e.clientY, e.target);
return false; return false;
} }
}; };
menu.onblur = function() {setTimeout(hide)}; menu.onblur = function() {setTimeout(r.hide)};
return r; return r;
})(); })();

13
copyparty/web/util.js
View file

@ -594,6 +594,19 @@ function yscroll() {
} }
return 0; return 0;
} }
function xscroll() {
if (document.documentElement.scrollLeft) {
return (window.xscroll = function () {
return document.documentElement.scrollLeft;
})();
}
if (window.pageXOffset) {
return (window.xscroll = function () {
return window.pageXOffset;
})();
}
return 0;
}
function showsort(tab) { function showsort(tab) {