Merge branch '6.4RC'6.4

5 files changed, 21 insertions, 25 deletions

diff --git a/vendor/blueimp/jquery-file-upload/js/jquery.fileupload-image.js b/vendor/blueimp/jquery-file-upload/js/jquery.fileupload-image.js
index c2056b954..ac0ccf1cc 100644
--- a/vendor/blueimp/jquery-file-upload/js/jquery.fileupload-image.js
+++ b/vendor/blueimp/jquery-file-upload/js/jquery.fileupload-image.js
@@ -81,7 +81,8 @@
       crop: '@',
       orientation: '@',
       forceResize: '@',
-      disabled: '@disableImageResize'
+      disabled: '@disableImageResize',
+      imageSmoothingQuality: '@imageSmoothingQuality'
     },
     {
       action: 'saveImage',
diff --git a/vendor/blueimp/jquery-file-upload/js/jquery.fileupload-process.js b/vendor/blueimp/jquery-file-upload/js/jquery.fileupload-process.js
index 130778e7f..56bf933b9 100644
--- a/vendor/blueimp/jquery-file-upload/js/jquery.fileupload-process.js
+++ b/vendor/blueimp/jquery-file-upload/js/jquery.fileupload-process.js
@@ -120,7 +120,7 @@
       options.processQueue = processQueue;
     },
 
-    // Returns the number of files currently in the processsing queue:
+    // Returns the number of files currently in the processing queue:
     processing: function () {
       return this._processing;
     },
diff --git a/vendor/blueimp/jquery-file-upload/js/jquery.fileupload-validate.js b/vendor/blueimp/jquery-file-upload/js/jquery.fileupload-validate.js
index a277efc46..03d92abf8 100644
--- a/vendor/blueimp/jquery-file-upload/js/jquery.fileupload-validate.js
+++ b/vendor/blueimp/jquery-file-upload/js/jquery.fileupload-validate.js
@@ -57,7 +57,7 @@
             */
 
       // Function returning the current number of files,
-      // has to be overriden for maxNumberOfFiles validation:
+      // has to be overridden for maxNumberOfFiles validation:
       getNumberOfFiles: $.noop,
 
       // Error and info messages:
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) {
diff --git a/vendor/blueimp/jquery-file-upload/js/vendor/jquery.ui.widget.js b/vendor/blueimp/jquery-file-upload/js/vendor/jquery.ui.widget.js
index 69096aaa3..78e625572 100644
--- a/vendor/blueimp/jquery-file-upload/js/vendor/jquery.ui.widget.js
+++ b/vendor/blueimp/jquery-file-upload/js/vendor/jquery.ui.widget.js
@@ -660,9 +660,8 @@
           ) {
             return;
           }
-          return (typeof handler === 'string'
-            ? instance[handler]
-            : handler
+          return (
+            typeof handler === 'string' ? instance[handler] : handler
           ).apply(instance, arguments);
         }
 
@@ -699,9 +698,8 @@
     _delay: function (handler, delay) {
       var instance = this;
       function handlerProxy() {
-        return (typeof handler === 'string'
-          ? instance[handler]
-          : handler
+        return (
+          typeof handler === 'string' ? instance[handler] : handler
         ).apply(instance, arguments);
       }
       return setTimeout(handlerProxy, delay || 0);
@@ -737,9 +735,8 @@
 
       data = data || {};
       event = $.Event(event);
-      event.type = (type === this.widgetEventPrefix
-        ? type
-        : this.widgetEventPrefix + type
+      event.type = (
+        type === this.widgetEventPrefix ? type : this.widgetEventPrefix + type
       ).toLowerCase();
 
       // The original event may come from any element