Skip to content

Commit de268aa

Browse files
committed
don't check folder size in Safari
1 parent f5d609f commit de268aa

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

lib/FileAPI.core.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
document = window.document,
1212
doctype = document.doctype || {},
1313
userAgent = window.navigator.userAgent,
14+
safari = /safari\//i.test(userAgent) && !/chrome\//i.test(userAgent),
1415

1516
// https://github.com/blueimp/JavaScript-Load-Image/blob/master/load-image.js#L48
1617
apiURL = (window.createObjectURL && window) || (window.URL && URL.revokeObjectURL && URL) || (window.webkitURL && webkitURL),
@@ -25,7 +26,7 @@
2526
jQuery = window.jQuery,
2627

2728
html5 = !!(File && (FileReader && (window.Uint8Array || FormData || XMLHttpRequest.prototype.sendAsBinary)))
28-
&& !(/safari\//i.test(userAgent) && !/chrome\//i.test(userAgent) && /windows/i.test(userAgent)), // BugFix: https://github.com/mailru/FileAPI/issues/25
29+
&& !(safari && /windows/i.test(userAgent)), // BugFix: https://github.com/mailru/FileAPI/issues/25
2930

3031
cors = html5 && ('withCredentials' in (new XMLHttpRequest)),
3132

@@ -1443,7 +1444,7 @@
14431444

14441445
function _isRegularFile(file, callback){
14451446
// http://stackoverflow.com/questions/8856628/detecting-folders-directories-in-javascript-filelist-objects
1446-
if( !file.type && (file.size % 4096) === 0 && (file.size <= 102400) ){
1447+
if( !file.type && (safari || ((file.size % 4096) === 0 && (file.size <= 102400))) ){
14471448
if( FileReader ){
14481449
try {
14491450
var Reader = new FileReader();

0 commit comments

Comments
 (0)