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

fix modal wordwrap in firefox;

Browse source 
with overflow:auto, firefox picks the div-width before estimating
the height, causing it to undershoot by the scrollbar width
and then messing up the text alignment

fix: conditionally set overflow-y:scroll using js
This commit is contained in:
ed 2024-07-29 18:04:35 +00:00
parent 9bb6e0dc62
commit a19a0fa9f3
2 changed files with 26 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
copyparty/web/ui.css
View file

@ -265,7 +265,11 @@ html.y #tth {
box-shadow: 0 .3em 3em rgba(0,0,0,0.5); box-shadow: 0 .3em 3em rgba(0,0,0,0.5);
max-width: 50em; max-width: 50em;
max-height: 30em; max-height: 30em;
overflow: auto; overflow-x: auto;
overflow-y: scroll;
}
#modalc.yk {
overflow-y: auto;
} }
#modalc td { #modalc td {
text-align: unset; text-align: unset;

23
copyparty/web/util.js
View file

@ -1536,6 +1536,7 @@ var modal = (function () {
var r = {}, var r = {},
q = [], q = [],
o = null, o = null,
scrolling = null,
cb_up = null, cb_up = null,
cb_ok = null, cb_ok = null,
cb_ng = null, cb_ng = null,
@ -1579,6 +1580,7 @@ var modal = (function () {
document.addEventListener('focus', onfocus); document.addEventListener('focus', onfocus);
document.addEventListener('selectionchange', onselch); document.addEventListener('selectionchange', onselch);
timer.add(scrollchk, 1);
timer.add(onfocus); timer.add(onfocus);
if (cb_up) if (cb_up)
setTimeout(cb_up, 1); setTimeout(cb_up, 1);
@ -1586,6 +1588,8 @@ var modal = (function () {
r.hide = function () { r.hide = function () {
timer.rm(onfocus); timer.rm(onfocus);
timer.rm(scrollchk);
scrolling = null;
try { try {
ebi('modal-ok').removeEventListener('blur', onblur); ebi('modal-ok').removeEventListener('blur', onblur);
} }
@ -1604,13 +1608,28 @@ var modal = (function () {
r.hide(); r.hide();
if (cb_ok) if (cb_ok)
cb_ok(v); cb_ok(v);
} };
var ng = function (e) { var ng = function (e) {
ev(e); ev(e);
r.hide(); r.hide();
if (cb_ng) if (cb_ng)
cb_ng(null); cb_ng(null);
} };
var scrollchk = function () {
if (scrolling === true)
return;
var o = ebi('modalc'),
vis = o.offsetHeight,
all = o.scrollHeight,
nsc = 8 + vis < all;
if (scrolling !== nsc)
clmod(o, 'yk', !nsc);
scrolling = nsc;
};
var onselch = function () { var onselch = function () {
try { try {