mirrors/copyparty
1
0
Fork 0
mirror of https://github.com/9001/copyparty.git synced 2025-09-28 12:42:26 -06:00
Code Issues Actions Packages Projects Releases Wiki Activity

bail from aborted batch operations; closes #748

Browse source 
f.shift() in rename_cb would return null since the queue was dumped
This commit is contained in:
ed 2025-09-05 21:43:33 +00:00
parent 96b109b0d6
commit aaeec11f81
1 changed files with 13 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
copyparty/web/browser.js
View file

@ -14343,6 +14343,7 @@ function fmt_ren(re, md, fmt) {
function fs_abrt() { function fs_abrt() {
toast.inf(30, L.fp_abrt); toast.inf(30, L.fp_abrt);
fileman.sn++;
fileman.f.length = 0; fileman.f.length = 0;
var xhr = new XHR(); var xhr = new XHR();
xhr.open('POST', '/?fs_abrt=' + abrt_key, true); xhr.open('POST', '/?fs_abrt=' + abrt_key, true);
@ -14361,6 +14362,7 @@ var fileman = (function () {
r = {}; r = {};
r.f = []; r.f = [];
r.sn = 1;
r.clip = null; r.clip = null;
try { try {
r.bus = new BroadcastChannel("fileman_bus"); r.bus = new BroadcastChannel("fileman_bus");
@ -14645,6 +14647,7 @@ var fileman = (function () {
return toast.err(3, L.fr_eperm); return toast.err(3, L.fr_eperm);
var f = [], var f = [],
sn = ++r.sn,
base = vsplit(sel[0].vp)[0], base = vsplit(sel[0].vp)[0],
mkeys; mkeys;
@ -14940,6 +14943,8 @@ var fileman = (function () {
toast.err(9, L.fr_efail + msg); toast.err(9, L.fr_efail + msg);
return; return;
} }
if (r.sn != sn)
return modal.confirm('WARNING: the rename was aborted');
f.shift().inew.value = '( OK )'; f.shift().inew.value = '( OK )';
return rn_apply_loop(); return rn_apply_loop();
@ -14956,6 +14961,7 @@ var fileman = (function () {
r.delete = function (e) { r.delete = function (e) {
var sel = msel.getsel(), var sel = msel.getsel(),
sn = ++r.sn,
vps = []; vps = [];
for (var a = 0; a < sel.length; a++) for (var a = 0; a < sel.length; a++)
@ -14992,6 +14998,9 @@ var fileman = (function () {
toast.err(9, L.fd_err + msg); toast.err(9, L.fd_err + msg);
return; return;
} }
if (r.sn != sn)
return modal.confirm('WARNING: the delete was aborted');
if (this.responseText.indexOf('deleted 0 files (and 0') + 1) { if (this.responseText.indexOf('deleted 0 files (and 0') + 1) {
toast.err(9, L.fd_none); toast.err(9, L.fd_none);
return deleter('xbd'); return deleter('xbd');
@ -15204,6 +15213,7 @@ var fileman = (function () {
'<div><table id="rn_f" class="m">', '<div><table id="rn_f" class="m">',
'<tr><td>' + L.fr_lnew + '</td><td>' + L.fr_lold + '</td></tr>', '<tr><td>' + L.fr_lnew + '</td><td>' + L.fr_lold + '</td></tr>',
], ],
sn = ++r.sn,
ui = false, ui = false,
f = [], f = [],
indir = [], indir = [],
@ -15263,6 +15273,9 @@ var fileman = (function () {
toast.err(9, (r.ccp ? L.fcp_err : L.fp_err) + msg); toast.err(9, (r.ccp ? L.fcp_err : L.fp_err) + msg);
return; return;
} }
if (r.sn != sn)
return modal.confirm('WARNING: the paste was aborted');
paster(); paster();
} }
function okgo() { function okgo() {