Skip to content

bug fix iemobile 8.1 #369

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
RubaXa merged 1 commit into from
Feb 16, 2016
Merged

bug fix iemobile 8.1 #369

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions dist/FileAPI.html5.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/*! FileAPI 2.0.18 - BSD | git://github.com/mailru/FileAPI.git
/*! FileAPI 2.0.19 - BSD | git://github.com/mailru/FileAPI.git
* FileAPI — a set of javascript tools for working with files. Multiupload, drag'n'drop and chunked file upload. Images: crop, resize and auto orientation by EXIF.
*/

Expand Down Expand Up @@ -106,6 +106,7 @@
doctype = document.doctype || {},
userAgent = window.navigator.userAgent,
safari = /safari\//i.test(userAgent) && !/chrome\//i.test(userAgent),
iemobile = /iemobile\//i.test(userAgent),

// https://github.com/blueimp/JavaScript-Load-Image/blob/master/load-image.js#L48
apiURL = (window.createObjectURL && window) || (window.URL && URL.revokeObjectURL && URL) || (window.webkitURL && webkitURL),
Expand All @@ -120,7 +121,7 @@
jQuery = window.jQuery,

html5 = !!(File && (FileReader && (window.Uint8Array || FormData || XMLHttpRequest.prototype.sendAsBinary)))
&& !(safari && /windows/i.test(userAgent)), // BugFix: https://github.com/mailru/FileAPI/issues/25
&& !(safari && /windows/i.test(userAgent) && !iemobile), // BugFix: https://github.com/mailru/FileAPI/issues/25

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

Expand Down Expand Up @@ -285,7 +286,7 @@
* FileAPI (core object)
*/
api = {
version: '2.0.18',
version: '2.0.19',

cors: false,
html5: true,
Expand Down
6 changes: 3 additions & 3 deletions dist/FileAPI.html5.min.js
View file
Open in desktop

Large diffs are not rendered by default.

7 changes: 4 additions & 3 deletions dist/FileAPI.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/*! FileAPI 2.0.18 - BSD | git://github.com/mailru/FileAPI.git
/*! FileAPI 2.0.19 - BSD | git://github.com/mailru/FileAPI.git
* FileAPI — a set of javascript tools for working with files. Multiupload, drag'n'drop and chunked file upload. Images: crop, resize and auto orientation by EXIF.
*/

Expand Down Expand Up @@ -106,6 +106,7 @@
doctype = document.doctype || {},
userAgent = window.navigator.userAgent,
safari = /safari\//i.test(userAgent) && !/chrome\//i.test(userAgent),
iemobile = /iemobile\//i.test(userAgent),

// https://github.com/blueimp/JavaScript-Load-Image/blob/master/load-image.js#L48
apiURL = (window.createObjectURL && window) || (window.URL && URL.revokeObjectURL && URL) || (window.webkitURL && webkitURL),
Expand All @@ -120,7 +121,7 @@
jQuery = window.jQuery,

html5 = !!(File && (FileReader && (window.Uint8Array || FormData || XMLHttpRequest.prototype.sendAsBinary)))
&& !(safari && /windows/i.test(userAgent)), // BugFix: https://github.com/mailru/FileAPI/issues/25
&& !(safari && /windows/i.test(userAgent) && !iemobile), // BugFix: https://github.com/mailru/FileAPI/issues/25

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

Expand Down Expand Up @@ -285,7 +286,7 @@
* FileAPI (core object)
*/
api = {
version: '2.0.18',
version: '2.0.19',

cors: false,
html5: true,
Expand Down
6 changes: 3 additions & 3 deletions dist/FileAPI.min.js
View file
Open in desktop

Large diffs are not rendered by default.

5 changes: 3 additions & 2 deletions lib/FileAPI.core.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
doctype = document.doctype || {},
userAgent = window.navigator.userAgent,
safari = /safari\//i.test(userAgent) && !/chrome\//i.test(userAgent),
iemobile = /iemobile\//i.test(userAgent),

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

html5 = !!(File && (FileReader && (window.Uint8Array || FormData || XMLHttpRequest.prototype.sendAsBinary)))
&& !(safari && /windows/i.test(userAgent)), // BugFix: https://github.com/mailru/FileAPI/issues/25
&& !(safari && /windows/i.test(userAgent) && !iemobile), // BugFix: https://github.com/mailru/FileAPI/issues/25

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

Expand Down Expand Up @@ -191,7 +192,7 @@
* FileAPI (core object)
*/
api = {
version: '2.0.18',
version: '2.0.19',

cors: false,
html5: true,
Expand Down