Skip to content

Commit 2715ee6

Browse files
committed
fix confusing toast on F2 with nothing selected (#100)
1 parent dc157fa commit 2715ee6

File tree

1 file changed

+13
-13
lines changed

1 file changed

+13
-13
lines changed

copyparty/web/browser.js

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -4622,13 +4622,13 @@ var fileman = (function () {
46224622

46234623
r.rename = function (e) {
46244624
ev(e);
4625-
if (clgot(bren, 'hide'))
4626-
return toast.err(3, L.fr_eperm);
4627-
46284625
var sel = msel.getsel();
46294626
if (!sel.length)
46304627
return toast.err(3, L.fr_emore);
46314628

4629+
if (clgot(bren, 'hide'))
4630+
return toast.err(3, L.fr_eperm);
4631+
46324632
var f = [],
46334633
base = vsplit(sel[0].vp)[0],
46344634
mkeys;
@@ -4931,9 +4931,6 @@ var fileman = (function () {
49314931

49324932
r.delete = function (e) {
49334933
ev(e);
4934-
if (clgot(bdel, 'hide'))
4935-
return toast.err(3, L.fd_eperm);
4936-
49374934
var sel = msel.getsel(),
49384935
vps = [];
49394936

@@ -4943,6 +4940,9 @@ var fileman = (function () {
49434940
if (!sel.length)
49444941
return toast.err(3, L.fd_emore);
49454942

4943+
if (clgot(bdel, 'hide'))
4944+
return toast.err(3, L.fd_eperm);
4945+
49464946
function deleter(err) {
49474947
var xhr = new XHR(),
49484948
vp = vps.shift();
@@ -4980,14 +4980,14 @@ var fileman = (function () {
49804980

49814981
r.cut = function (e) {
49824982
ev(e);
4983-
if (clgot(bcut, 'hide'))
4984-
return toast.err(3, L.fc_eperm);
4985-
49864983
var sel = msel.getsel(),
49874984
vps = [];
49884985

49894986
if (!sel.length)
4990-
toast.err(3, L.fc_emore);
4987+
return toast.err(3, L.fc_emore);
4988+
4989+
if (clgot(bcut, 'hide'))
4990+
return toast.err(3, L.fc_eperm);
49914991

49924992
var els = [], griden = thegrid.en;
49934993
for (var a = 0; a < sel.length; a++) {
@@ -5095,12 +5095,12 @@ var fileman = (function () {
50955095
};
50965096

50975097
r.paste = function () {
5098-
if (clgot(bpst, 'hide'))
5099-
return toast.err(3, L.fp_eperm);
5100-
51015098
if (!r.clip.length)
51025099
return toast.err(5, L.fp_ecut);
51035100

5101+
if (clgot(bpst, 'hide'))
5102+
return toast.err(3, L.fp_eperm);
5103+
51045104
var req = [],
51055105
exists = [],
51065106
indir = [],

0 commit comments

Comments
 (0)