Skip to content

Commit a6569b8

Browse files
committed
Merge remote-tracking branch 'origin/AC-2658' into Hammer_Platform_Health_246_Scope_09112022
2 parents f438171 + 5e62ee3 commit a6569b8

File tree

3 files changed

+18
-23
lines changed

3 files changed

+18
-23
lines changed

lib/web/jquery/fileUploader/jquery.fileupload-process.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@
120120
options.processQueue = processQueue;
121121
},
122122

123-
// Returns the number of files currently in the processsing queue:
123+
// Returns the number of files currently in the processing queue:
124124
processing: function () {
125125
return this._processing;
126126
},

lib/web/jquery/fileUploader/jquery.fileupload.js

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -455,7 +455,7 @@
455455
_initProgressListener: function (options) {
456456
var that = this,
457457
xhr = options.xhr ? options.xhr() : $.ajaxSettings.xhr();
458-
// Accesss to the native XHR object is required to add event listeners
458+
// Access to the native XHR object is required to add event listeners
459459
// for the upload progress event:
460460
if (xhr.upload) {
461461
$(xhr.upload).on('progress', function (e) {
@@ -489,15 +489,14 @@
489489
name = String(name);
490490
if (map[name]) {
491491
// eslint-disable-next-line no-param-reassign
492-
name = name.replace(/(?: \(([\d]+)\))?(\.[^.]+)?$/, function (
493-
_,
494-
p1,
495-
p2
496-
) {
497-
var index = p1 ? Number(p1) + 1 : 1;
498-
var ext = p2 || '';
499-
return ' (' + index + ')' + ext;
500-
});
492+
name = name.replace(
493+
/(?: \(([\d]+)\))?(\.[^.]+)?$/,
494+
function (_, p1, p2) {
495+
var index = p1 ? Number(p1) + 1 : 1;
496+
var ext = p2 || '';
497+
return ' (' + index + ')' + ext;
498+
}
499+
);
501500
return this._getUniqueFilename(name, map);
502501
}
503502
map[name] = true;
@@ -1172,7 +1171,7 @@
11721171
data.fileInputClone = inputClone;
11731172
$('<form></form>').append(inputClone)[0].reset();
11741173
// Detaching allows to insert the fileInput on another form
1175-
// without loosing the file input value:
1174+
// without losing the file input value:
11761175
input.after(inputClone).detach();
11771176
// If the fileInput had focus before it was detached,
11781177
// restore focus to the inputClone.
@@ -1298,8 +1297,7 @@
12981297
_getSingleFileInputFiles: function (fileInput) {
12991298
// eslint-disable-next-line no-param-reassign
13001299
fileInput = $(fileInput);
1301-
var entries =
1302-
fileInput.prop('webkitEntries') || fileInput.prop('entries'),
1300+
var entries = fileInput.prop('entries'),
13031301
files,
13041302
value;
13051303
if (entries && entries.length) {

lib/web/jquery/fileUploader/vendor/jquery.ui.widget.js

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -660,9 +660,8 @@
660660
) {
661661
return;
662662
}
663-
return (typeof handler === 'string'
664-
? instance[handler]
665-
: handler
663+
return (
664+
typeof handler === 'string' ? instance[handler] : handler
666665
).apply(instance, arguments);
667666
}
668667

@@ -699,9 +698,8 @@
699698
_delay: function (handler, delay) {
700699
var instance = this;
701700
function handlerProxy() {
702-
return (typeof handler === 'string'
703-
? instance[handler]
704-
: handler
701+
return (
702+
typeof handler === 'string' ? instance[handler] : handler
705703
).apply(instance, arguments);
706704
}
707705
return setTimeout(handlerProxy, delay || 0);
@@ -737,9 +735,8 @@
737735

738736
data = data || {};
739737
event = $.Event(event);
740-
event.type = (type === this.widgetEventPrefix
741-
? type
742-
: this.widgetEventPrefix + type
738+
event.type = (
739+
type === this.widgetEventPrefix ? type : this.widgetEventPrefix + type
743740
).toLowerCase();
744741

745742
// The original event may come from any element

0 commit comments

Comments
 (0)