fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-01-09 03:32:00 +09:00
Code Issues Projects Releases Packages Wiki Activity

Revert "#2284 jQuery Fileupload가 safari에도 파일 업로드에 실패하는 문제 수정"

Browse source 
This reverts commit 21acfd97cc.
This commit is contained in:
Kijin Sung 2018-10-11 14:27:12 +09:00
parent b2bd6bf1e4
commit fa4fb72b27
1 changed files with 14 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

21
common/js/plugins/jquery.fileupload/js/jquery.fileupload.js vendored
View file

@ -1144,10 +1144,10 @@
$.map(entries, function (entry) {
return that._handleFileTreeEntry(entry, path);
})
).then(function (entries) {
).then(function () {
return Array.prototype.concat.apply(
[],
entries
arguments
);
});
},
@ -1179,9 +1179,16 @@
_getSingleFileInputFiles: function (fileInput) {
fileInput = $(fileInput);
var files = $.makeArray(fileInput.prop('files'));
var entries = fileInput.prop('webkitEntries') ||
fileInput.prop('entries'),
files,
value;
if (entries && entries.length) {
return this._handleFileTreeEntries(entries);
}
files = $.makeArray(fileInput.prop('files'));
if (!files.length) {
var value = fileInput.prop('value');
value = fileInput.prop('value');
if (!value) {
return $.Deferred().resolve([]).promise();
}
@ -1206,10 +1213,10 @@
return $.when.apply(
$,
$.map(fileInput, this._getSingleFileInputFiles)
).then(function (files) {
).then(function () {
return Array.prototype.concat.apply(
[],
files
arguments
);
});
},
@ -1221,7 +1228,7 @@
form: $(e.target.form)
};
this._getFileInputFiles(data.fileInput).always(function (files) {
data.files = $.makeArray(files);
data.files = files;
if (that.options.replaceFileInput) {
that._replaceFileInput(data);
}