Skip to content

Commit 779a687

Browse files
anton-evseevanton-evseev
committed
Check for Safari before checking for Chrome on insecure connection
1 parent 6fc5598 commit 779a687

File tree

5 files changed

+5
-5
lines changed

5 files changed

+5
-5
lines changed

‎dist/FileAPI.html5.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@
107107
userAgent = window.navigator.userAgent,
108108
safari = /safari\//i.test(userAgent) && !/chrome\//i.test(userAgent),
109109
iemobile = /iemobile\//i.test(userAgent),
110-
insecureChrome = /chrome\//i.test(userAgent) && window.location.protocol === 'http:',
110+
insecureChrome = !safari && /chrome\//i.test(userAgent) && window.location.protocol === 'http:',
111111

112112
// https://github.com/blueimp/JavaScript-Load-Image/blob/master/load-image.js#L48
113113
apiURL = (window.createObjectURL && window) || (window.URL && URL.revokeObjectURL && URL) || (window.webkitURL && webkitURL),

‎dist/FileAPI.html5.min.js‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/FileAPI.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@
107107
userAgent = window.navigator.userAgent,
108108
safari = /safari\//i.test(userAgent) && !/chrome\//i.test(userAgent),
109109
iemobile = /iemobile\//i.test(userAgent),
110-
insecureChrome = /chrome\//i.test(userAgent) && window.location.protocol === 'http:',
110+
insecureChrome = !safari && /chrome\//i.test(userAgent) && window.location.protocol === 'http:',
111111

112112
// https://github.com/blueimp/JavaScript-Load-Image/blob/master/load-image.js#L48
113113
apiURL = (window.createObjectURL && window) || (window.URL && URL.revokeObjectURL && URL) || (window.webkitURL && webkitURL),

‎dist/FileAPI.min.js‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎lib/FileAPI.core.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
userAgent = window.navigator.userAgent,
1414
safari = /safari\//i.test(userAgent) && !/chrome\//i.test(userAgent),
1515
iemobile = /iemobile\//i.test(userAgent),
16-
insecureChrome = /chrome\//i.test(userAgent) && window.location.protocol === 'http:',
16+
insecureChrome = !safari && /chrome\//i.test(userAgent) && window.location.protocol === 'http:',
1717

1818
// https://github.com/blueimp/JavaScript-Load-Image/blob/master/load-image.js#L48
1919
apiURL = (window.createObjectURL && window) || (window.URL && URL.revokeObjectURL && URL) || (window.webkitURL && webkitURL),

0 commit comments

Comments
 (0)