mirrors/copyparty
1
0
Fork 0
mirror of https://github.com/9001/copyparty.git synced 2025-08-18 01:22:13 -06:00
Code Issues Actions Packages Projects Releases Wiki Activity

reload-signal to source folder on paste

Browse source
This commit is contained in:
ed 2021-07-26 20:49:26 +02:00
parent 279c9d706a
commit af752fbbc2
2 changed files with 26 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
copyparty/web/browser.js
View file

@ -1500,9 +1500,9 @@ var fileman = (function () {
if (src.endsWith('/')) if (src.endsWith('/'))
src = src.slice(0, -1); src = src.slice(0, -1);
var ofs = src.lastIndexOf('/') + 1, var vsp = vsplit(src),
base = src.slice(0, ofs), base = vsp[0],
ofn = src.slice(ofs); ofn = vsp[1];
var fn = prompt('new filename:', ofn); var fn = prompt('new filename:', ofn);
if (!fn || fn == ofn) if (!fn || fn == ofn)
@ -1593,7 +1593,7 @@ var fileman = (function () {
toast.inf(1000, 'cut ' + sel.length + ' items'); toast.inf(1000, 'cut ' + sel.length + ' items');
jwrite('fman_clip', vps); jwrite('fman_clip', vps);
r.tx(); r.tx(1);
}; };
r.paste = function (e) { r.paste = function (e) {
@ -1604,6 +1604,7 @@ var fileman = (function () {
var req = [], var req = [],
exists = [], exists = [],
indir = [], indir = [],
srcdir = vsplit(r.clip[0])[0],
links = QSA('#files tbody td:nth-child(2) a'); links = QSA('#files tbody td:nth-child(2) a');
for (var a = 0, aa = links.length; a < aa; a++) for (var a = 0, aa = links.length; a < aa; a++)
@ -1637,6 +1638,7 @@ var fileman = (function () {
if (!vp) { if (!vp) {
toast.ok(2000, 'paste OK'); toast.ok(2000, 'paste OK');
treectl.goto(get_evpath()); treectl.goto(get_evpath());
r.tx(srcdir);
return; return;
} }
toast.inf(2000, 'pasting ' + (req.length + 1) + ' items<br /><br />' + vp); toast.inf(2000, 'pasting ' + (req.length + 1) + ' items<br /><br />' + vp);
@ -1661,17 +1663,19 @@ var fileman = (function () {
paster(); paster();
jwrite('fman_clip', []); jwrite('fman_clip', []);
r.tx();
}; };
r.bus.onmessage = function () { r.bus.onmessage = function (e) {
console.log('fman onmsg');
r.clip = null; r.clip = null;
var me = get_evpath();
if (e && e.data == me)
treectl.goto(e.data);
else
r.render(); r.render();
}; };
r.tx = function () { r.tx = function (msg) {
r.bus.postMessage(1); r.bus.postMessage(msg);
r.bus.onmessage(); r.bus.onmessage();
}; };

12
copyparty/web/util.js
View file

@ -361,6 +361,18 @@ function linksplit(rp) {
} }
function vsplit(vp) {
if (vp.endsWith('/'))
vp = vp.slice(0, -1);
var ofs = vp.lastIndexOf('/') + 1,
base = vp.slice(0, ofs),
fn = vp.slice(ofs);
return [base, fn];
}
function uricom_enc(txt, do_fb_enc) { function uricom_enc(txt, do_fb_enc) {
try { try {
return encodeURIComponent(txt); return encodeURIComponent(txt);