mirrors/copyparty
1
0
Fork 0
mirror of https://github.com/9001/copyparty.git synced 2026-06-21 05:32:25 -06:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge commit '7fb00fb9644a4a87bbd5b5f6914dbf023595fa8a' into hovudstraum

Browse source
This commit is contained in:
Til Schmitter 2026-06-08 21:20:49 +02:00
parent 315e7dcc10 7fb00fb964
commit 5f690a09f8
1 changed files with 19 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
copyparty/web/browser.js
View file

@ -4628,10 +4628,10 @@ var fileman = (function () {
encut = nsel, encut = nsel,
encpy = nsel, encpy = nsel,
enpst = r.clip && r.clip.length, enpst = r.clip && r.clip.length,
hren = !(have_mv && has(perms, 'write') && has(perms, 'move')), hren = !(have_mv && has(perms, 'write') && has(perms, 'move')) || !nsel,
hdel = !(have_del && has(perms, 'delete')), hdel = !(have_del && has(perms, 'delete')) || !nsel,
hcut = !(have_mv && has(perms, 'move')), hcut = !(have_mv && has(perms, 'move')) || !nsel,
hpst = !(have_mv && has(perms, 'write')), hpst = !(have_mv && has(perms, 'write')) || !enpst,
hshr = !can_shr || !get_evpath().indexOf(have_shr), hshr = !can_shr || !get_evpath().indexOf(have_shr),
enclr = enpst || nsel; enclr = enpst || nsel;
@ -4649,7 +4649,8 @@ var fileman = (function () {
clmod(bren, 'hide', hren); clmod(bren, 'hide', hren);
clmod(bdel, 'hide', hdel); clmod(bdel, 'hide', hdel);
clmod(bcut, 'hide', hcut); clmod(bcut, 'hide', hcut);
clmod(bpst, 'hide', hpst); clmod(bcpy, 'hide', !encpy);
clmod(bpst, 'hide', !enpst);
clmod(bshr, 'hide', hshr); clmod(bshr, 'hide', hshr);
clmod(bclr, 'hide', !enclr); clmod(bclr, 'hide', !enclr);
@ -5366,6 +5367,9 @@ var fileman = (function () {
catch (ex) { catch (ex) {
toast.warn(30, L.fc_warn.format(sel.length)); toast.warn(30, L.fc_warn.format(sel.length));
} }
if(thegrid.tempsel)
msel.evsel();
}; };
r.cpy = function (e) { r.cpy = function (e) {
@ -5426,6 +5430,9 @@ var fileman = (function () {
catch (ex) { catch (ex) {
toast.warn(30, L.fcc_warn.format(sel.length)); toast.warn(30, L.fcc_warn.format(sel.length));
} }
if(thegrid.tempsel)
msel.evsel();
}; };
document.onpaste = function (e) { document.onpaste = function (e) {
@ -6449,7 +6456,7 @@ window.thegrid = (function () {
return r.loadsel(); return r.loadsel();
clmod(this, 'sel', clgot(tr, 'sel')); clmod(this, 'sel', clgot(tr, 'sel'));
} }
else if (in_tree && !have_sel) else if (in_tree)
in_tree.click(); in_tree.click();
else if (oth.hasAttribute('download')) else if (oth.hasAttribute('download'))
@ -6458,14 +6465,14 @@ window.thegrid = (function () {
else if (aplay && (r.vau || !is_img)) else if (aplay && (r.vau || !is_img))
aplay.click(); aplay.click();
else if (is_dir && !have_sel) else if (is_dir)
treectl.reqls(qhref, true); treectl.reqls(qhref, true);
else if (is_txt && !has(['md', 'htm', 'html'], is_txt)) else if (is_txt && !has(['md', 'htm', 'html'], is_txt))
atext.click(); atext.click();
else if (!is_img && have_sel) // else if (!is_img && have_sel)
window.open(qhref, '_blank'); // window.open(qhref, '_blank');
else { else {
if (!dbl){ if (!dbl){
@ -7124,6 +7131,9 @@ var ahotkeys = function (e) {
if (QS('#music.vis')) if (QS('#music.vis'))
return ebi('cl_mu').click(); return ebi('cl_mu').click();
if (!clgot(ebi('fclr'), 'hide'))
return fileman.clear();
if (QS('.opview.act')) if (QS('.opview.act'))
return QS('#ops>a').click(); return QS('#ops>a').click();