Skip to content
This repository was archived by the owner on May 25, 2023. It is now read-only.
Closed
Changes from all commits
Commits
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
26 changes: 26 additions & 0 deletions js/jquery.fileupload.js
Original file line number Diff line number Diff line change
Expand Up @@ -1219,6 +1219,32 @@
file.size = file.fileSize;
});
}

// Fix for iOS 9 not correctly grabbing names of images from Photo Library
// https://apple.stackexchange.com/questions/118154
var allDuplicateNames = true;
$.each(files, function (index, file) {
if (files[0].name !== file.name) {
allDuplicateNames = false;
}
});

if (this.options.dedupeFilenames || allDuplicateNames) {
var newFiles = [];
var fileNames = {};

$.each(files, function (index, file) {
var occurrences = (fileNames[file.name] || 0) + 1;
fileNames[file.name] = occurrences;
var newFile = new Blob( [ file ], { type: file.type } );
var extension = file.name.match(/\.\w*$/)
var uniqueId = (occurrences > 1 ? (occurrences - 1) : '')
var newName = file.name.replace(/\.\w*$/, '') + uniqueId + extension
newFile.name = newName
newFiles.push(newFile);
});
files = newFiles;
}
return $.Deferred().resolve(files).promise();
},

Expand Down