mirrors/copyparty
1
0
Fork 0
mirror of https://github.com/9001/copyparty.git synced 2026-06-20 21:22:26 -06:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge commit '3a356893ee0cc19c14750d027f9898e3827eb55d' into hovudstraum

Browse source
This commit is contained in:
Til Schmitter 2026-05-05 20:39:16 +02:00
parent 97c9647ed6 3a356893ee
commit a14320d6c2
2 changed files with 16 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored
View file

@ -18,6 +18,7 @@ copyparty.egg-info/
# ide # ide
*.sublime-workspace *.sublime-workspace
/.vs
# winmerge # winmerge
*.bak *.bak

22
copyparty/web/browser.js
View file

@ -7748,11 +7748,12 @@ var treectl = (function () {
clmod(ebi('wfp'), 'shifted', false); clmod(ebi('wfp'), 'shifted', false);
window.addEventListener('scroll', onscroll); window.addEventListener('scroll', onscroll);
window.addEventListener('resize', onresize); window.addEventListener('resize', onresize);
// accounts for animation delay
// makes animation work by waiting for next frame
setTimeout(function () { setTimeout(function () {
onresize(); onresize();
aligngriditems(); aligngriditems();
}, 150); }, 10);
}; };
r.detree = function (e, nw) { r.detree = function (e, nw) {
@ -7780,9 +7781,6 @@ var treectl = (function () {
r.hide = function () { r.hide = function () {
r.hidden = true; r.hidden = true;
ebi('tree').style.width = ebi('tree_footer').style.width = '0'; ebi('tree').style.width = ebi('tree_footer').style.width = '0';
setTimeout(function () {
ebi('tree').style.display = 'none'
}, 150);
ebi('tree_footer').style.display = 'none'; ebi('tree_footer').style.display = 'none';
ebi('widget').style.marginLeft = '0'; ebi('widget').style.marginLeft = '0';
ebi('wrap').style.marginLeft = ''; ebi('wrap').style.marginLeft = '';
@ -7790,6 +7788,11 @@ var treectl = (function () {
window.removeEventListener('resize', onresize); window.removeEventListener('resize', onresize);
window.removeEventListener('scroll', onscroll); window.removeEventListener('scroll', onscroll);
aligngriditems(); aligngriditems();
// wait for animation to finish (.15s), then set display to none if width still 0
setTimeout(function () {
onresize();
}, 170);
}; };
function unmenter() { function unmenter() {
@ -7876,8 +7879,11 @@ var treectl = (function () {
timer.add(onscroll2, true); timer.add(onscroll2, true);
function onresize(e) { function onresize(e) {
if (!entreed || r.hidden) if (!entreed || r.hidden){
if(ebi('tree').style.width == '0px')
ebi('tree').style.display = 'none';
return; return;
}
var q = '#tree', var q = '#tree',
nq = -3; nq = -3;
@ -8888,8 +8894,10 @@ function apply_perms(res) {
thegrid.setvis(); thegrid.setvis();
var up_only = !have_read && have_write; var up_only = !have_read && have_write;
if (up_only) if (up_only){
goto('up2k'); goto('up2k');
clmod(document.documentElement, 'noscroll', false);
}
clmod(ebi('up2k'), 'unmodal', up_only); clmod(ebi('up2k'), 'unmodal', up_only);
clmod(ebi('opa_mkd'), 'vis', up_only); clmod(ebi('opa_mkd'), 'vis', up_only);
} }