From 4603afb6def715a64d0eae7419492a0f078f2d4b Mon Sep 17 00:00:00 2001 From: ed Date: Fri, 8 Nov 2024 21:51:54 +0000 Subject: [PATCH] don't consume ctrl-shift-c (devtools inspector) --- copyparty/web/browser.js | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/copyparty/web/browser.js b/copyparty/web/browser.js index 5d3aa96a..c8ff461c 100644 --- a/copyparty/web/browser.js +++ b/copyparty/web/browser.js @@ -5016,7 +5016,6 @@ var fileman = (function () { }; r.delete = function (e) { - ev(e); var sel = msel.getsel(), vps = []; @@ -5026,6 +5025,8 @@ var fileman = (function () { if (!sel.length) return toast.err(3, L.fd_emore); + ev(e); + if (clgot(bdel, 'hide')) return toast.err(3, L.fd_eperm); @@ -5065,7 +5066,6 @@ var fileman = (function () { }; r.cut = function (e) { - ev(e); var sel = msel.getsel(), stamp = Date.now(), vps = [stamp]; @@ -5073,6 +5073,8 @@ var fileman = (function () { if (!sel.length) return toast.err(3, L.fc_emore); + ev(e); + if (clgot(bcut, 'hide')) return toast.err(3, L.fc_eperm); @@ -5118,7 +5120,6 @@ var fileman = (function () { }; r.cpy = function (e) { - ev(e); var sel = msel.getsel(), stamp = Date.now(), vps = [stamp, '//c']; @@ -5126,6 +5127,8 @@ var fileman = (function () { if (!sel.length) return toast.err(3, L.fcp_emore); + ev(e); + var els = [], griden = thegrid.en; for (var a = 0; a < sel.length; a++) { vps.push(sel[a].vp); @@ -5531,7 +5534,7 @@ var showfile = (function () { if (ah.textContent.endsWith('/')) continue; - + if (lang == 'ts' || (lang == 'md' && td.textContent != '-')) continue; @@ -6516,21 +6519,21 @@ var ahotkeys = function (e) { if (e.key == '?') return hkhelp(); - if (ctrl(e)) { + if (!e.shiftKey && ctrl(e)) { var sel = window.getSelection && window.getSelection() || {}; sel = sel && !sel.isCollapsed && sel.direction != 'none'; if (k == 'KeyX' || k == 'x') - return fileman.cut(); + return fileman.cut(e); if ((k == 'KeyC' || k == 'c') && !sel) - return fileman.cpy(); + return fileman.cpy(e); if (k == 'KeyV' || k == 'v') - return fileman.d_paste(); + return fileman.d_paste(e); if (k == 'KeyK' || k == 'k') - return fileman.delete(); + return fileman.delete(e); return; }