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

misc modal rice and html escaping

Browse source
This commit is contained in:
ed 2021-08-26 23:23:56 +02:00
parent 1a02948a61
commit 9c6e2ec012
5 changed files with 25 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
copyparty/web/browser.js
View file

@ -2010,8 +2010,8 @@ var fileman = (function () {
deleter(); deleter();
} }
modal.confirm('===== DANGER =====\nDELETE these ' + vps.length + ' items?\n\n' + uricom_adec(vps).join('\n'), function () { modal.confirm('<h6 style="color:#900">DANGER</h6>\n<b>DELETE these ' + vps.length + ' items?</b><ul>' + uricom_adec(vps, true).join('') + '</ul>', function () {
modal.confirm('Last chance! Delete?', deleter, null); modal.confirm('<b>Last chance!</b> Delete?', deleter, null);
}, null); }, null);
}; };
@ -2110,7 +2110,7 @@ var fileman = (function () {
paster(); paster();
} }
modal.confirm('paste these ' + req.length + ' items here?\n\n' + uricom_adec(req).join('\n'), function () { modal.confirm('paste these ' + req.length + ' items here?<ul>' + uricom_adec(req, true).join('') + '</ul>', function () {
paster(); paster();
jwrite('fman_clip', []); jwrite('fman_clip', []);
}, null); }, null);

2
copyparty/web/md.js
View file

@ -185,7 +185,7 @@ function md_plug_err(ex, js) {
errbox.style.cssText = 'position:absolute;top:0;left:0;padding:1em .5em;background:#2b2b2b;color:#fc5' errbox.style.cssText = 'position:absolute;top:0;left:0;padding:1em .5em;background:#2b2b2b;color:#fc5'
errbox.textContent = msg; errbox.textContent = msg;
errbox.onclick = function () { errbox.onclick = function () {
modal.alert('<pre>' + ex.stack + '</pre>'); modal.alert('<pre>' + esc(ex.stack) + '</pre>');
}; };
if (o) { if (o) {
errbox.appendChild(o); errbox.appendChild(o);

10
copyparty/web/ui.css
View file

@ -165,6 +165,16 @@ html.light #tt em {
min-width: 30em; min-width: 30em;
} }
} }
#modalc li {
margin: 1em 0;
}
#modalc h6 {
font-size: 1.3em;
border-bottom: 1px solid #999;
margin: 0;
padding: .3em;
text-align: center;
}
#modalb { #modalb {
position: sticky; position: sticky;
text-align: right; text-align: right;

12
copyparty/web/up2k.js
View file

@ -725,11 +725,11 @@ function up2k_init(subtle) {
match = false; match = false;
if (match) { if (match) {
var msg = ['directory iterator got stuck on the following {0} items; good chance your browser is about to spinlock:'.format(missing.length)]; var msg = ['directory iterator got stuck on the following {0} items; good chance your browser is about to spinlock:<ul>'.format(missing.length)];
for (var a = 0; a < Math.min(20, missing.length); a++) for (var a = 0; a < Math.min(20, missing.length); a++)
msg.push(missing[a]); msg.push('<li>' + esc(missing[a]) + '</li>');
return modal.alert(msg.join('\n-- '), function () { return modal.alert(msg.join('') + '</ul>', function () {
read_dirs(rd, [], [], good, bad, spins); read_dirs(rd, [], [], good, bad, spins);
}); });
} }
@ -800,12 +800,12 @@ function up2k_init(subtle) {
}); });
} }
var msg = ['{0} these {1} files?'.format(fsearch ? 'search' : 'upload', good_files.length)]; var msg = ['{0} these {1} files?<ul>'.format(fsearch ? 'search' : 'upload', good_files.length)];
for (var a = 0, aa = Math.min(20, good_files.length); a < aa; a++) for (var a = 0, aa = Math.min(20, good_files.length); a < aa; a++)
msg.push(good_files[a][1]); msg.push('<li>' + esc(good_files[a][1]) + '</li>');
if (ask_up && !fsearch) if (ask_up && !fsearch)
return modal.confirm(msg.join('\n'), function () { up_them(good_files); }, null); return modal.confirm(msg.join('') + '</ul>', function () { up_them(good_files); }, null);
up_them(good_files); up_them(good_files);
} }

8
copyparty/web/util.js
View file

@ -353,10 +353,12 @@ function uricom_dec(txt) {
} }
function uricom_adec(arr) { function uricom_adec(arr, li) {
var ret = []; var ret = [];
for (var a = 0; a < arr.length; a++) for (var a = 0; a < arr.length; a++) {
ret.push(uricom_dec(arr[a])[0]); var txt = uricom_dec(arr[a])[0];
ret.push(li ? '<li>' + esc(txt) + '</li>' : txt);
}
return ret; return ret;
} }