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

shift/ctrl-click improvements:

Browse source 
* always enable shift-click selection in list-view
* shift-clicking thumbnails opens in new window by default as expected
* enable shift-select in grid-view when multiselect is on
* invert select when the same shift-select is made repeatedly
This commit is contained in:
ed 2023-07-16 18:15:56 +00:00
parent 88b876027c
commit 5aa54d1217
2 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
copyparty/web/baguettebox.js
View file

@ -127,7 +127,7 @@ window.baguetteBox = (function () {
var gallery = []; var gallery = [];
[].forEach.call(tagsNodeList, function (imageElement, imageIndex) { [].forEach.call(tagsNodeList, function (imageElement, imageIndex) {
var imageElementClickHandler = function (e) { var imageElementClickHandler = function (e) {
if (ctrl(e)) if (ctrl(e) || e && e.shiftKey)
return true; return true;
e.preventDefault ? e.preventDefault() : e.returnValue = false; e.preventDefault ? e.preventDefault() : e.returnValue = false;

19
copyparty/web/browser.js
View file

@ -189,8 +189,8 @@ var Ls = {
"cl_hpick": "click one column header to hide in the table below", "cl_hpick": "click one column header to hide in the table below",
"cl_hcancel": "column hiding aborted", "cl_hcancel": "column hiding aborted",
"ct_thumb": "in icon view, toggle icons or thumbnails$NHotkey: T", "ct_thumb": "in grid-view, toggle icons or thumbnails$NHotkey: T",
"ct_csel": "use CTRL and SHIFT for file selection", "ct_csel": "use CTRL and SHIFT for file selection in grid-view",
"ct_dots": "show hidden files (if server permits)", "ct_dots": "show hidden files (if server permits)",
"ct_dir1st": "sort folders before files", "ct_dir1st": "sort folders before files",
"ct_readme": "show README.md in folder listings", "ct_readme": "show README.md in folder listings",
@ -652,7 +652,7 @@ var Ls = {
"cl_hcancel": "kolonne-skjuling avbrutt", "cl_hcancel": "kolonne-skjuling avbrutt",
"ct_thumb": "vis miniatyrbilder istedenfor ikoner$NSnarvei: T", "ct_thumb": "vis miniatyrbilder istedenfor ikoner$NSnarvei: T",
"ct_csel": "bruk tastene CTRL og SHIFT for markering av filer", "ct_csel": "bruk tastene CTRL og SHIFT for markering av filer i ikonvisning",
"ct_dots": "vis skjulte filer (gitt at serveren tillater det)", "ct_dots": "vis skjulte filer (gitt at serveren tillater det)",
"ct_dir1st": "sorter slik at mapper kommer foran filer", "ct_dir1st": "sorter slik at mapper kommer foran filer",
"ct_readme": "vis README.md nedenfor filene", "ct_readme": "vis README.md nedenfor filene",
@ -4300,7 +4300,7 @@ var thegrid = (function () {
setsz(); setsz();
function gclick1(e) { function gclick1(e) {
if (ctrl(e) && !treectl.csel) if (ctrl(e) && !treectl.csel && !r.sel)
return true; return true;
return gclick.bind(this)(e, false); return gclick.bind(this)(e, false);
@ -4324,7 +4324,7 @@ var thegrid = (function () {
td = oth.closest('td').nextSibling, td = oth.closest('td').nextSibling,
tr = td.parentNode; tr = td.parentNode;
if (r.sel && !dbl || treectl.csel && (e.shiftKey || ctrl(e))) { if ((r.sel && !dbl && !ctrl(e)) || (treectl.csel && (e.shiftKey || ctrl(e)))) {
td.onclick.bind(td)(e); td.onclick.bind(td)(e);
if (e.shiftKey) if (e.shiftKey)
return r.loadsel(); return r.loadsel();
@ -6749,7 +6749,7 @@ var msel = (function () {
var tr = this.parentNode, var tr = this.parentNode,
id = tr2id(tr); id = tr2id(tr);
if (treectl.csel && e.shiftKey && r.so && id && r.so != id) { if ((treectl.csel || !thegrid.en || thegrid.sel) && e.shiftKey && r.so && id && r.so != id) {
var o1 = -1, o2 = -1; var o1 = -1, o2 = -1;
for (a = 0; a < r.all.length; a++) { for (a = 0; a < r.all.length; a++) {
var ai = r.all[a].id; var ai = r.all[a].id;
@ -6762,11 +6762,16 @@ var msel = (function () {
if (o1 > o2) if (o1 > o2)
o2 = [o1, o1 = o2][0]; o2 = [o1, o1 = o2][0];
if (r.pr) if (r.pr) {
// invert previous range, in case it was narrowed // invert previous range, in case it was narrowed
for (var a = r.pr[0]; a <= r.pr[1]; a++) for (var a = r.pr[0]; a <= r.pr[1]; a++)
clmod(ebi(r.all[a].id).closest('tr'), 'sel', !st); clmod(ebi(r.all[a].id).closest('tr'), 'sel', !st);
// and invert current selection if repeated
if (r.pr[0] === o1 && r.pr[1] === o2)
st = !st;
}
for (var a = o1; a <= o2; a++) for (var a = o1; a <= o2; a++)
clmod(ebi(r.all[a].id).closest('tr'), 'sel', st); clmod(ebi(r.all[a].id).closest('tr'), 'sel', st);