Skip to content

Commit 568dd40

Browse files
committed
Address issue #147
1 parent 55ac7f7 commit 568dd40

2 files changed

Lines changed: 19 additions & 15 deletions

File tree

src/flow.js

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -578,10 +578,7 @@
578578
addFiles: function (fileList, event) {
579579
var files = [];
580580
each(fileList, function (file) {
581-
// Uploading empty file IE10/IE11 hangs indefinitely
582-
// see https://connect.microsoft.com/IE/feedback/details/813443/uploading-empty-file-ie10-ie11-hangs-indefinitely
583-
// Directories have size `0` and name `.`
584-
// Ignore already added files if opts.allowDuplicateUploads is set to false
581+
// https://github.com/flowjs/flow.js/issues/55
585582
if ((!ie10plus || ie10plus && file.size > 0) && !(file.size % 4096 === 0 && (file.name === '.' || file.fileName === '.')) &&
586583
(this.opts.allowDuplicateUploads || !this.getFromUniqueIdentifier(this.generateUniqueIdentifier(file)))) {
587584
var f = new FlowFile(this, file);

test/uploadSpec.js

Lines changed: 18 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -364,17 +364,24 @@ describe('upload file', function() {
364364
flow.on('fileSuccess', success);
365365

366366
flow.addFile(new Blob([]));
367-
var file = flow.files[0];
368-
flow.upload();
369-
expect(requests.length).toBe(1);
370-
expect(file.progress()).toBe(0);
371-
requests[0].respond(200);
372-
expect(requests.length).toBe(1);
373-
expect(error).not.toHaveBeenCalled();
374-
expect(success).toHaveBeenCalled();
375-
expect(file.progress()).toBe(1);
376-
expect(file.isUploading()).toBe(false);
377-
expect(file.isComplete()).toBe(true);
367+
368+
// https://github.com/flowjs/flow.js/issues/55
369+
if (window.navigator.msPointerEnabled) {
370+
expect(flow.files.length, 0);
371+
} else {
372+
expect(flow.files.length, 1);
373+
var file = flow.files[0];
374+
flow.upload();
375+
expect(requests.length).toBe(1);
376+
expect(file.progress()).toBe(0);
377+
requests[0].respond(200);
378+
expect(requests.length).toBe(1);
379+
expect(error).not.toHaveBeenCalled();
380+
expect(success).toHaveBeenCalled();
381+
expect(file.progress()).toBe(1);
382+
expect(file.isUploading()).toBe(false);
383+
expect(file.isComplete()).toBe(true);
384+
}
378385
});
379386

380387
it('should not upload folder', function () {

0 commit comments

Comments
 (0)