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

fix android-chrome layout glitch in up2k

Browse source
This commit is contained in:
ed 2021-06-18 23:38:43 +02:00
parent 51d14a6b4d
commit 57579b2fe5
3 changed files with 26 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
copyparty/web/browser.js
View file

@ -2042,8 +2042,8 @@ function despin(sel) {
} }
function apply_perms(perms) { function apply_perms(newperms) {
perms = perms || []; perms = newperms || [];
var o = QSA('#ops>a[data-perm], #u2footfoot'); var o = QSA('#ops>a[data-perm], #u2footfoot');
for (var a = 0; a < o.length; a++) { for (var a = 0; a < o.length; a++) {
@ -2065,8 +2065,16 @@ function apply_perms(perms) {
var have_write = has(perms, "write"), var have_write = has(perms, "write"),
have_read = has(perms, "read"), have_read = has(perms, "read"),
de = document.documentElement,
tds = QSA('#u2conf td'); tds = QSA('#u2conf td');
/* good idea maybe
clmod(de, "read", have_read);
clmod(de, "write", have_write);
clmod(de, "nread", !have_read);
clmod(de, "nwrite", !have_write);
*/
for (var a = 0; a < tds.length; a++) { for (var a = 0; a < tds.length; a++) {
tds[a].style.display = tds[a].style.display =
(have_write || tds[a].getAttribute('data-perm') == 'read') ? (have_write || tds[a].getAttribute('data-perm') == 'read') ?
@ -2360,7 +2368,7 @@ var light;
light = bcfg_get('lightmode', false); light = bcfg_get('lightmode', false);
function freshen() { function freshen() {
document.documentElement.setAttribute("class", light ? "light" : ""); clmod(document.documentElement, "light", light);
pbar.drawbuf(); pbar.drawbuf();
pbar.drawpos(); pbar.drawpos();
vbar.draw(); vbar.draw();

20
copyparty/web/up2k.js
View file

@ -444,8 +444,7 @@ function up2k_init(subtle) {
} }
// show uploader if the user only has write-access // show uploader if the user only has write-access
var perms = document.body.getAttribute('perms'); if (perms.length && !has(perms, 'read'))
if (perms && !has(perms.split(' '), 'read'))
goto('up2k'); goto('up2k');
// shows or clears a message in the basic uploader ui // shows or clears a message in the basic uploader ui
@ -1265,7 +1264,7 @@ function up2k_init(subtle) {
fpx = parseInt(getComputedStyle(bar)['font-size']), fpx = parseInt(getComputedStyle(bar)['font-size']),
wem = wpx * 1.0 / fpx, wem = wpx * 1.0 / fpx,
wide = wem > 54, wide = wem > 54,
parent = ebi(wide ? 'u2btn_cw' : 'u2btn_ct'), parent = ebi(wide && has(perms, 'write') ? 'u2btn_cw' : 'u2btn_ct'),
btn = ebi('u2btn'); btn = ebi('u2btn');
//console.log([wpx, fpx, wem]); //console.log([wpx, fpx, wem]);
@ -1278,6 +1277,13 @@ function up2k_init(subtle) {
window.addEventListener('resize', onresize); window.addEventListener('resize', onresize);
onresize(); onresize();
if (is_touch) {
// android-chrome wobbles for a bit; firefox / iOS-safari are OK
setTimeout(onresize, 20);
setTimeout(onresize, 100);
setTimeout(onresize, 500);
}
var o = QSA('#u2conf *[tt]'); var o = QSA('#u2conf *[tt]');
for (var a = o.length - 1; a >= 0; a--) { for (var a = o.length - 1; a >= 0; a--) {
o[a].parentNode.getElementsByTagName('input')[0].setAttribute('tt', o[a].getAttribute('tt')); o[a].parentNode.getElementsByTagName('input')[0].setAttribute('tt', o[a].getAttribute('tt'));
@ -1330,14 +1336,12 @@ function up2k_init(subtle) {
} }
function set_fsearch(new_state) { function set_fsearch(new_state) {
var perms = document.body.getAttribute('perms'), var fixed = false;
fixed = false;
if (!ebi('fsearch')) { if (!ebi('fsearch')) {
new_state = false; new_state = false;
} }
else if (perms) { else if (perms.length) {
perms = perms.split(' ');
if (!has(perms, 'write')) { if (!has(perms, 'write')) {
new_state = true; new_state = true;
fixed = true; fixed = true;
@ -1367,6 +1371,8 @@ function up2k_init(subtle) {
ebi('u2bm').innerHTML = ico + ' <sup>' + desc + '</sup>'; ebi('u2bm').innerHTML = ico + ' <sup>' + desc + '</sup>';
} }
catch (ex) { } catch (ex) { }
onresize();
} }
function tgl_flag_en() { function tgl_flag_en() {

3
copyparty/web/util.js
View file

@ -6,7 +6,8 @@ if (!window['console'])
}; };
var is_touch = 'ontouchstart' in window, var perms = [],
is_touch = 'ontouchstart' in window,
ANDROID = /(android)/i.test(navigator.userAgent); ANDROID = /(android)/i.test(navigator.userAgent);