Skip to content

fix: IE bug when we're uploading from an iframe #876

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: IE bug when we're uploading from an iframe #876

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
30 changes: 15 additions & 15 deletions src/services/FileUploader.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,14 @@ let {


export default function __identity(fileUploaderOptions, $rootScope, $http, $window, $timeout, FileLikeObject, FileItem, Pipeline) {


let {
File,
FormData
} = $window;


class FileUploader {
/**********************
* PUBLIC
Expand All @@ -38,7 +38,7 @@ export default function __identity(fileUploaderOptions, $rootScope, $http, $wind
*/
constructor(options) {
var settings = copy(fileUploaderOptions);

extend(this, settings, options, {
isUploading: false,
_nextIndex: 0,
Expand All @@ -63,11 +63,11 @@ export default function __identity(fileUploaderOptions, $rootScope, $http, $wind

let next = () => {
let something = incomingQueue.shift();

if (isUndefined(something)) {
return done();
}

let fileLikeObject = this.isFile(something) ? something : new FileLikeObject(something);
let pipes = this._convertFiltersToPipes(arrayOfFilters);
let pipeline = new Pipeline(pipes);
Expand All @@ -88,7 +88,7 @@ export default function __identity(fileUploaderOptions, $rootScope, $http, $wind
pipeline.onSuccessful = onSuccessful;
pipeline.exec(fileLikeObject, options);
};

let done = () => {
if(this.queue.length !== count) {
this._onAfterAddingAll(addedFileItems);
Expand All @@ -98,7 +98,7 @@ export default function __identity(fileUploaderOptions, $rootScope, $http, $wind
this._render();
if (this.autoUpload) this.uploadAll();
};

next();
}
/**
Expand Down Expand Up @@ -771,7 +771,7 @@ export default function __identity(fileUploaderOptions, $rootScope, $http, $wind
* @private
*/
static isFile(value) {
return (File && value instanceof File);
return File && (value instanceof File || value.contructor === window.parent.File);
}
/**
* Returns "true" if value an instance of FileLikeObject
Expand Down Expand Up @@ -820,18 +820,18 @@ export default function __identity(fileUploaderOptions, $rootScope, $http, $wind
*/
FileUploader.isHTML5 = FileUploader.prototype.isHTML5;


return FileUploader;
}


__identity.$inject = [
'fileUploaderOptions',
'$rootScope',
'$http',
'fileUploaderOptions',
'$rootScope',
'$http',
'$window',
'$timeout',
'FileLikeObject',
'FileItem',
'Pipeline'
];
];