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

macos-safari support

Browse source
This commit is contained in:
ed 2022-09-23 19:36:07 +02:00
parent 37c84021a2
commit d285f7ee4a
3 changed files with 19 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
copyparty/web/browser.js
View file

@ -4608,7 +4608,11 @@ function aligngriditems() {
return; return;
var em2px = parseFloat(getComputedStyle(ebi('ggrid')).fontSize); var em2px = parseFloat(getComputedStyle(ebi('ggrid')).fontSize);
var gridsz = getComputedStyle(document.getElementsByTagName('html')[0]).getPropertyValue('--grid-sz').slice(0, -2); var gridsz = 10;
try {
gridsz = getComputedStyle(document.documentElement).getPropertyValue('--grid-sz').slice(0, -2);
}
catch (ex) { }
var gridwidth = ebi('ggrid').clientWidth; var gridwidth = ebi('ggrid').clientWidth;
var griditemcount = ebi('ggrid').children.length; var griditemcount = ebi('ggrid').children.length;
var totalgapwidth = em2px * griditemcount; var totalgapwidth = em2px * griditemcount;

23
copyparty/web/up2k.js
View file

@ -928,11 +928,7 @@ function up2k_init(subtle) {
r.st = st; r.st = st;
r.uc = uc; r.uc = uc;
var bobslice = null; if (!window.File || !File.prototype.slice || !window.FileReader || !window.FileList)
if (window.File)
bobslice = File.prototype.slice || File.prototype.mozSlice || File.prototype.webkitSlice;
if (!bobslice || !window.FileReader || !window.FileList)
return un2k(L.u_ever); return un2k(L.u_ever);
var flag = false; var flag = false;
@ -1051,17 +1047,25 @@ function up2k_init(subtle) {
for (var a = 0, aa = e.target.files.length; a < aa; a++) { for (var a = 0, aa = e.target.files.length; a < aa; a++) {
var fobj = e.target.files[a], var fobj = e.target.files[a],
name = fobj.webkitRelativePath,
dst = good_files; dst = good_files;
try { try {
if (!name)
throw 1;
if (fobj.size < 1) if (fobj.size < 1)
dst = nil_files; dst = nil_files;
} }
catch (ex) { catch (ex) {
dst = bad_files; dst = bad_files;
} }
dst.push([fobj, fobj.webkitRelativePath]); dst.push([fobj, name]);
} }
if (!good_files.length && bad_files.length)
return toast.err(30, "that's not a folder!\n\nyour browser is too old,\nplease try dragdrop instead");
return read_dirs(null, [], [], good_files, nil_files, bad_files); return read_dirs(null, [], [], good_files, nil_files, bad_files);
} }
@ -1870,8 +1874,7 @@ function up2k_init(subtle) {
toast.err(0, 'y o u b r o k e i t\nfile: ' + esc(t.name + '') + '\nerror: ' + err); toast.err(0, 'y o u b r o k e i t\nfile: ' + esc(t.name + '') + '\nerror: ' + err);
}; };
bpend++; bpend++;
reader.readAsArrayBuffer( reader.readAsArrayBuffer(t.fobj.slice(car, cdr));
bobslice.call(t.fobj, car, cdr));
return true; return true;
}; };
@ -2441,7 +2444,7 @@ function up2k_init(subtle) {
xhr.overrideMimeType('Content-Type', 'application/octet-stream'); xhr.overrideMimeType('Content-Type', 'application/octet-stream');
xhr.responseType = 'text'; xhr.responseType = 'text';
xhr.send(bobslice.call(t.fobj, car, cdr)); xhr.send(t.fobj.slice(car, cdr));
} }
do_send(); do_send();
} }
@ -2723,7 +2726,7 @@ function up2k_init(subtle) {
Notification.requestPermission().then(chknag, chknag); Notification.requestPermission().then(chknag, chknag);
} }
if (uc.upnag && !window.Notification || Notification.permission != 'granted') if (uc.upnag && (!window.Notification || Notification.permission != 'granted'))
bcfg_set('upnag', uc.upnag = false); bcfg_set('upnag', uc.upnag = false);
ebi('nthread_add').onclick = function (e) { ebi('nthread_add').onclick = function (e) {

3
copyparty/web/w.hash.js
View file

@ -68,8 +68,7 @@ onmessage = (d) => {
}; };
//console.log('[ w] %d read bgin', nchunk); //console.log('[ w] %d read bgin', nchunk);
busy = true; busy = true;
reader.readAsArrayBuffer( reader.readAsArrayBuffer(fobj.slice(car, cdr));
File.prototype.slice.call(fobj, car, cdr));
var hash_calc = function (buf) { var hash_calc = function (buf) {