aboutsummaryrefslogtreecommitdiffstats
path: root/vendor/blueimp/jquery-file-upload/js
diff options
context:
space:
mode:
authorMario Vavti <mario@mariovavti.com>2019-09-23 09:02:53 +0000
committerMario <mario@mariovavti.com>2019-09-23 12:19:33 +0200
commit3fac7b5bb7e490c9cd641f0ddd6de2d2c76915f6 (patch)
tree158d53f87abfbfc73dcf0b5314c387068afb6cba /vendor/blueimp/jquery-file-upload/js
parent9b90114d035ce4c10ee11cd2fbffe1f5ab95af17 (diff)
downloadvolse-hubzilla-3fac7b5bb7e490c9cd641f0ddd6de2d2c76915f6.tar.gz
volse-hubzilla-3fac7b5bb7e490c9cd641f0ddd6de2d2c76915f6.tar.bz2
volse-hubzilla-3fac7b5bb7e490c9cd641f0ddd6de2d2c76915f6.zip
composer update blueimp/jquery-file-upload
(cherry picked from commit 53b8ee7866eb1394980b08b90153a63563832391)
Diffstat (limited to 'vendor/blueimp/jquery-file-upload/js')
-rw-r--r--vendor/blueimp/jquery-file-upload/js/jquery.fileupload.js35
1 files changed, 34 insertions, 1 deletions
diff --git a/vendor/blueimp/jquery-file-upload/js/jquery.fileupload.js b/vendor/blueimp/jquery-file-upload/js/jquery.fileupload.js
index 700f9013c..53c169e2a 100644
--- a/vendor/blueimp/jquery-file-upload/js/jquery.fileupload.js
+++ b/vendor/blueimp/jquery-file-upload/js/jquery.fileupload.js
@@ -165,6 +165,15 @@
bitrateInterval: 500,
// By default, uploads are started automatically when adding files:
autoUpload: true,
+ // By default, duplicate file names are expected to be handled on
+ // the server-side. If this is not possible (e.g. when uploading
+ // files directly to Amazon S3), the following option can be set to
+ // an empty object or an object mapping existing filenames, e.g.:
+ // { "image.jpg": true, "image (1).jpg": true }
+ // If it is set, all files will be uploaded with unique filenames,
+ // adding increasing number suffixes if necessary, e.g.:
+ // "image (2).jpg"
+ uniqueFilenames: undefined,
// Error and info messages:
messages: {
@@ -449,6 +458,23 @@
return Object.prototype.toString.call(obj) === '[object ' + type + ']';
},
+ _getUniqueFilename: function (name, map) {
+ name = String(name);
+ if (map[name]) {
+ name = name.replace(
+ /(?: \(([\d]+)\))?(\.[^.]+)?$/,
+ function (_, p1, p2) {
+ var index = p1 ? Number(p1) + 1 : 1;
+ var ext = p2 || '';
+ return ' (' + index + ')' + ext;
+ }
+ );
+ return this._getUniqueFilename(name, map);
+ }
+ map[name] = true;
+ return name;
+ },
+
_initXHRData: function (options) {
var that = this,
formData,
@@ -510,11 +536,18 @@
// dummy objects:
if (that._isInstanceOf('File', file) ||
that._isInstanceOf('Blob', file)) {
+ var fileName = file.uploadName || file.name;
+ if (options.uniqueFilenames) {
+ fileName = that._getUniqueFilename(
+ fileName,
+ options.uniqueFilenames
+ );
+ }
formData.append(
($.type(options.paramName) === 'array' &&
options.paramName[index]) || paramName,
file,
- file.uploadName || file.name
+ fileName
);
}
});