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

gridview: uncropped tall pics are tall + more granular zoom

Browse source
This commit is contained in:
ed 2024-02-21 08:27:03 +00:00
parent d07859e8e6
commit 5026b21226
2 changed files with 26 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
copyparty/web/browser.css
View file

@ -985,6 +985,10 @@ html.y #path a:hover {
margin: 0 auto; margin: 0 auto;
display: block; display: block;
} }
#ggrid.nocrop>a img {
max-height: 20em;
max-height: calc(var(--grid-sz)*2);
}
#ggrid>a.dir:before { #ggrid>a.dir:before {
content: '📂'; content: '📂';
} }

35
copyparty/web/browser.js
View file

@ -4523,8 +4523,8 @@ var thegrid = (function () {
'<a href="#" class="tgl btn" id="gridcrop" tt="' + L.gt_crop + '</a> ' + '<a href="#" class="tgl btn" id="gridcrop" tt="' + L.gt_crop + '</a> ' +
'<a href="#" class="tgl btn" id="grid3x" tt="' + L.gt_3x + '</a> ' + '<a href="#" class="tgl btn" id="grid3x" tt="' + L.gt_3x + '</a> ' +
'<span>' + L.gt_zoom + ': ' + '<span>' + L.gt_zoom + ': ' +
'<a href="#" class="btn" z="-1.2" tt="Hotkey: shift-A">&ndash;</a> ' + '<a href="#" class="btn" z="-1.1" tt="Hotkey: shift-A">&ndash;</a> ' +
'<a href="#" class="btn" z="1.2" tt="Hotkey: shift-D">+</a></span> <span>' + L.gt_chop + ': ' + '<a href="#" class="btn" z="1.1" tt="Hotkey: shift-D">+</a></span> <span>' + L.gt_chop + ': ' +
'<a href="#" class="btn" l="-1" tt="' + L.gt_c1 + '">&ndash;</a> ' + '<a href="#" class="btn" l="-1" tt="' + L.gt_c1 + '">&ndash;</a> ' +
'<a href="#" class="btn" l="1" tt="' + L.gt_c2 + '">+</a></span> <span>' + L.gt_sort + ': ' + '<a href="#" class="btn" l="1" tt="' + L.gt_c2 + '">+</a></span> <span>' + L.gt_sort + ': ' +
'<a href="#" s="href">' + L.gt_name + '</a> ' + '<a href="#" s="href">' + L.gt_name + '</a> ' +
@ -4535,6 +4535,7 @@ var thegrid = (function () {
'<div id="ggrid"></div>' '<div id="ggrid"></div>'
); );
lfiles.parentNode.insertBefore(gfiles, lfiles); lfiles.parentNode.insertBefore(gfiles, lfiles);
var ggrid = ebi('ggrid');
var r = { var r = {
'sz': clamp(fcfg_get('gridsz', 10), 4, 80), 'sz': clamp(fcfg_get('gridsz', 10), 4, 80),
@ -4555,7 +4556,7 @@ var thegrid = (function () {
if (l) if (l)
return setln(parseInt(l)); return setln(parseInt(l));
var t = ebi('files').tHead.rows[0].cells; var t = lfiles.tHead.rows[0].cells;
for (var a = 0; a < t.length; a++) for (var a = 0; a < t.length; a++)
if (t[a].getAttribute('name') == s) { if (t[a].getAttribute('name') == s) {
t[a].click(); t[a].click();
@ -4580,10 +4581,13 @@ var thegrid = (function () {
lfiles = ebi('files'); lfiles = ebi('files');
gfiles = ebi('gfiles'); gfiles = ebi('gfiles');
ggrid = ebi('ggrid');
var vis = has(perms, "read"); var vis = has(perms, "read");
gfiles.style.display = vis && r.en ? '' : 'none'; gfiles.style.display = vis && r.en ? '' : 'none';
lfiles.style.display = vis && !r.en ? '' : 'none'; lfiles.style.display = vis && !r.en ? '' : 'none';
clmod(ggrid, 'crop', r.crop);
clmod(ggrid, 'nocrop', !r.crop);
ebi('pro').style.display = ebi('epi').style.display = ebi('lazy').style.display = ebi('treeul').style.display = ebi('treepar').style.display = ''; ebi('pro').style.display = ebi('epi').style.display = ebi('lazy').style.display = ebi('treeul').style.display = ebi('treepar').style.display = '';
ebi('bdoc').style.display = 'none'; ebi('bdoc').style.display = 'none';
clmod(ebi('wrap'), 'doc'); clmod(ebi('wrap'), 'doc');
@ -4773,7 +4777,7 @@ var thegrid = (function () {
pels[a].removeAttribute('tt'); pels[a].removeAttribute('tt');
} }
tt.att(ebi('ggrid')); tt.att(ggrid);
}; };
function loadgrid() { function loadgrid() {
@ -4849,7 +4853,9 @@ var thegrid = (function () {
(r.sz / 1.25) + 'em" loading="lazy" onload="th_onload(this)" src="' + (r.sz / 1.25) + 'em" loading="lazy" onload="th_onload(this)" src="' +
ihref + '" /><span' + ac + '>' + ao.innerHTML + '</span></a>'); ihref + '" /><span' + ac + '>' + ao.innerHTML + '</span></a>');
} }
ebi('ggrid').innerHTML = html.join('\n'); ggrid.innerHTML = html.join('\n');
clmod(ggrid, 'crop', r.crop);
clmod(ggrid, 'nocrop', !r.crop);
var srch = ebi('unsearch'), var srch = ebi('unsearch'),
gsel = ebi('gridsel'); gsel = ebi('gridsel');
@ -5641,19 +5647,21 @@ function aligngriditems() {
if (!treectl) if (!treectl)
return; return;
var em2px = parseFloat(getComputedStyle(ebi('ggrid')).fontSize); var ggrid = ebi('ggrid'),
var gridsz = 10; em2px = parseFloat(getComputedStyle(ggrid).fontSize),
gridsz = 10;
try { try {
gridsz = cprop('--grid-sz').slice(0, -2); gridsz = cprop('--grid-sz').slice(0, -2);
} }
catch (ex) { } catch (ex) { }
var gridwidth = ebi('ggrid').clientWidth; var gridwidth = ggrid.clientWidth,
var griditemcount = ebi('ggrid').children.length; griditemcount = ggrid.children.length,
var totalgapwidth = em2px * griditemcount; totalgapwidth = em2px * griditemcount;
if (/b/.test(themen + '')) if (/b/.test(themen + ''))
totalgapwidth *= 2.8; totalgapwidth *= 2.8;
var val, st = ebi('ggrid').style; var val, st = ggrid.style;
if (((griditemcount * em2px) * gridsz) + totalgapwidth < gridwidth) { if (((griditemcount * em2px) * gridsz) + totalgapwidth < gridwidth) {
val = 'left'; val = 'left';
@ -6166,13 +6174,14 @@ var treectl = (function () {
r.nextdir = null; r.nextdir = null;
var cdir = get_evpath(), var cdir = get_evpath(),
cur = ebi('files').getAttribute('ts'); lfiles = ebi('files'),
cur = lfiles.getAttribute('ts');
if (cur && parseInt(cur) > this.ts) { if (cur && parseInt(cur) > this.ts) {
console.log("reject ls"); console.log("reject ls");
return; return;
} }
ebi('files').setAttribute('ts', this.ts); lfiles.setAttribute('ts', this.ts);
try { try {
var res = JSON.parse(this.responseText); var res = JSON.parse(this.responseText);