Merge branch '6.4RC'6.4

1 files changed, 11 insertions, 13 deletions

diff --git a/vendor/blueimp/jquery-file-upload/js/jquery.fileupload.js b/vendor/blueimp/jquery-file-upload/js/jquery.fileupload.js
index 184d34721..e56ce76f1 100644
--- a/vendor/blueimp/jquery-file-upload/js/jquery.fileupload.js
+++ b/vendor/blueimp/jquery-file-upload/js/jquery.fileupload.js
@@ -455,7 +455,7 @@
     _initProgressListener: function (options) {
       var that = this,
         xhr = options.xhr ? options.xhr() : $.ajaxSettings.xhr();
-      // Accesss to the native XHR object is required to add event listeners
+      // Access to the native XHR object is required to add event listeners
       // for the upload progress event:
       if (xhr.upload) {
         $(xhr.upload).on('progress', function (e) {
@@ -489,15 +489,14 @@
       name = String(name);
       if (map[name]) {
         // eslint-disable-next-line no-param-reassign
-        name = name.replace(/(?: \(([\d]+)\))?(\.[^.]+)?$/, function (
-          _,
-          p1,
-          p2
-        ) {
-          var index = p1 ? Number(p1) + 1 : 1;
-          var ext = p2 || '';
-          return ' (' + index + ')' + ext;
-        });
+        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;
@@ -1172,7 +1171,7 @@
       data.fileInputClone = inputClone;
       $('<form></form>').append(inputClone)[0].reset();
       // Detaching allows to insert the fileInput on another form
-      // without loosing the file input value:
+      // without losing the file input value:
       input.after(inputClone).detach();
       // If the fileInput had focus before it was detached,
       // restore focus to the inputClone.
@@ -1298,8 +1297,7 @@
     _getSingleFileInputFiles: function (fileInput) {
       // eslint-disable-next-line no-param-reassign
       fileInput = $(fileInput);
-      var entries =
-          fileInput.prop('webkitEntries') || fileInput.prop('entries'),
+      var entries = fileInput.prop('entries'),
         files,
         value;
       if (entries && entries.length) {