Skip to content

Commit 9f166b9

Browse files
committed
MC-36410: [Chrome] Loader stacks during import when the same file is checked after update
1 parent 041c564 commit 9f166b9

File tree

1 file changed

+24
-6
lines changed
  • app/code/Magento/ImportExport/view/adminhtml/templates/import/form

1 file changed

+24
-6
lines changed

app/code/Magento/ImportExport/view/adminhtml/templates/import/form/before.phtml

Lines changed: 24 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -190,12 +190,30 @@ require([
190190
postToFrame: function(newActionUrl) {
191191
var fileUploader = document.getElementById('{$fieldNameSourceFile}');
192192
193-
if (fileUploader.files.length > 0 && fileUploader.files[0].lastModified !== this.loadedFileLastModified) {
194-
alert({
195-
content: '{$uploaderErrorMessage}'
196-
});
197-
fileUploader.value = null;
198-
return;
193+
if (fileUploader.files.length > 0) {
194+
var file = fileUploader.files[0],
195+
ifrElName = this.ifrElemName,
196+
reader = new FileReader();
197+
198+
reader.readAsText(file, "UTF-8");
199+
200+
reader.onerror = function () {
201+
jQuery('body').loader('hide');
202+
alert({
203+
content: '{$uploaderErrorMessage}'
204+
});
205+
fileUploader.value = null;
206+
jQuery('iframe#' + ifrElName).remove();
207+
return;
208+
}
209+
210+
if (file.lastModified !== this.loadedFileLastModified) {
211+
alert({
212+
content: '{$uploaderErrorMessage}'
213+
});
214+
fileUploader.value = null;
215+
return;
216+
}
199217
}
200218
201219
if (!jQuery('[name="' + this.ifrElemName + '"]').length) {

0 commit comments

Comments
 (0)