Skip to content

Commit e2da584

Browse files
committed
AC-10720::Migration from outdated jquery/fileUpload library - Resolve Static Errors
1 parent 8b29c30 commit e2da584

File tree

4 files changed

+9
-7
lines changed

4 files changed

+9
-7
lines changed

app/code/Magento/Catalog/view/adminhtml/web/catalog/base-image-uploader.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
* See COPYING.txt for license details.
44
*/
55

6+
/* eslint-disable no-undef */
7+
68
define([
79
'jquery',
810
'mage/template',
@@ -142,6 +144,7 @@ define([
142144
fileId = null,
143145
arrayFromObj = Array.from,
144146
fileObj = [],
147+
uploaderContainer = this.element.find('input[type="file"]').closest('.image-placeholder'),
145148
options = {
146149
proudlyDisplayPoweredByUppy: false,
147150
target: targetElement,
@@ -188,7 +191,6 @@ define([
188191
tempFileId: fileId
189192
};
190193

191-
var uploaderContainer = this.element.find('input[type="file"]').closest('.image-placeholder');
192194
uploaderContainer.addClass('loading');
193195
fileObj.push(currentFile);
194196
return modifiedFile;
@@ -245,7 +247,6 @@ define([
245247
});
246248

247249
uppy.on('complete', () => {
248-
var uploaderContainer = this.element.find('input[type="file"]').closest('.image-placeholder');
249250
uploaderContainer.removeClass('loading');
250251
Array.from = arrayFromObj;
251252
});

app/code/Magento/Ui/view/base/web/js/form/element/file-uploader.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ define([
1717
'Magento_Ui/js/form/element/abstract',
1818
'mage/backend/notification',
1919
'mage/translate',
20+
'jquery/jquery.cookie',
2021
'jquery/uppy-core',
2122
'mage/adminhtml/tools'
2223
], function ($, _, utils, uiAlert, validator, Element, notification, $t) {
@@ -85,7 +86,7 @@ define([
8586
hideProgressAfterFinish: true
8687
};
8788

88-
if (fileInputName === undefined){
89+
if (fileInputName === undefined) {
8990
fileInputName = $(fileInput).attr('name');
9091
}
9192
// handle input type file

dev/tests/js/jasmine/tests/app/code/Magento/Backend/view/adminhtml/web/js/media-uploader.test.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
define([
99
'jquery',
1010
'Magento_Backend/js/media-uploader'
11-
], function ($, mediaUploader) {
11+
], function ($) {
1212
'use strict';
1313

1414
describe('Magento_Backend/js/media-uploader::_create()', function () {

dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/element/file-uploader.test.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -84,9 +84,9 @@ define([
8484
expect(component.initUploader).toHaveBeenCalledWith(fileInputMock);
8585
expect(component.replaceInputTypeFile).toHaveBeenCalledWith(fileInputMock);
8686

87-
expect(uppyMock.use).toHaveBeenCalledWith(Uppy.Dashboard, jasmine.any(Object));
88-
expect(uppyMock.use).toHaveBeenCalledWith(Uppy.DropTarget, jasmine.any(Object));
89-
expect(uppyMock.use).toHaveBeenCalledWith(Uppy.XHRUpload, jasmine.any(Object));
87+
expect(uppyMock.use).toHaveBeenCalledWith(window.Uppy.Dashboard, jasmine.any(Object));
88+
expect(uppyMock.use).toHaveBeenCalledWith(window.Uppy.DropTarget, jasmine.any(Object));
89+
expect(uppyMock.use).toHaveBeenCalledWith(window.Uppy.XHRUpload, jasmine.any(Object));
9090
});
9191
});
9292

0 commit comments

Comments
 (0)