Skip to content

fix ie10+ hangs indefinitely #69

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
AidasK merged 3 commits into from
Jan 7, 2015
Merged

fix ie10+ hangs indefinitely #69

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b82f14e
Merge pull request #1 from flowjs/master
dolymood Jul 25, 2014
9829556
Merge pull request #2 from flowjs/master
dolymood Jan 7, 2015
48c78fb
fix ie10+ hangs indefinitely
dolymood Jan 7, 2015
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: 5 additions & 2 deletions src/flow.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@
* @license MIT
*/
(function(window, document, undefined) {'use strict';

// ie10+
var ie10plus = window.navigator.msPointerEnabled;
/**
* Flow.js is a library providing multiple simultaneous, stable and
* resumable uploads via the HTML5 File API.
Expand Down Expand Up @@ -562,9 +563,11 @@
addFiles: function (fileList, event) {
var files = [];
each(fileList, function (file) {
// Uploading empty file IE10/IE11 hangs indefinitely
// see https://connect.microsoft.com/IE/feedback/details/813443/uploading-empty-file-ie10-ie11-hangs-indefinitely
// Directories have size `0` and name `.`
// Ignore already added files
if (!(file.size % 4096 === 0 && (file.name === '.' || file.fileName === '.')) &&
if ((!ie10plus || ie10plus && file.size > 0) && !(file.size % 4096 === 0 && (file.name === '.' || file.fileName === '.')) &&
!this.getFromUniqueIdentifier(this.generateUniqueIdentifier(file))) {
var f = new FlowFile(this, file);
if (this.fire('fileAdded', f, event)) {
Expand Down