Skip to content

Commit 98701f3

Browse files
author
Cari Spruiell
committed
MAGETWO-52993: [Github] Media Uploader Issues #2958
- updates for CR feedback
1 parent 415a4b7 commit 98701f3

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

app/code/Magento/Cms/view/adminhtml/templates/browser/content.phtml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
<div class="title"><?php /* @escapeNotVerified */ echo $block->getHeaderText() ?></div>
2121
</div>
2222
</div>
23+
<div id="error-message" data-action="show-error"></div>
2324
<div id="contents-uploader" class="contents-uploader"><?php echo $block->getChildHtml('wysiwyg_images.uploader') ?></div>
2425
<div id="contents"></div>
2526
</div>

app/code/Magento/Cms/view/adminhtml/templates/browser/content/uploader.phtml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -69,16 +69,16 @@ require([
6969
},
7070
done: function (e, data) {
7171
var progressSelector = '#' + data.fileId + ' .progressbar-container .progressbar';
72+
var tempErrorMessage = document.createElement("div");
7273
$(progressSelector).css('width', '100%');
7374
if (data.result && !data.result.hasOwnProperty('errorcode')) {
74-
$("#content_header").children(".message").remove();
75+
$('[data-action="show-error"]').children(".message").remove();
7576
$(progressSelector).removeClass('upload-progress').addClass('upload-success');
7677
} else {
77-
var tempErrorMessage = document.createElement("div");
7878
tempErrorMessage.className = "message message-warning warning";
7979
tempErrorMessage.innerHTML = data.result.error;
8080

81-
$("#content_header").append(tempErrorMessage);
81+
$('[data-action="show-error"]').append(tempErrorMessage);
8282
$(progressSelector).removeClass('upload-progress').addClass('upload-failure');
8383
}
8484
},

0 commit comments

Comments
 (0)