Skip to content

Commit b12f867

Browse files
authored
Merge pull request #7404 from magento-trigger/AC-2066
[Trigger] Bug Fixes
2 parents f5c555a + f3c5946 commit b12f867

File tree

3 files changed

+3
-2
lines changed

3 files changed

+3
-2
lines changed

app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/grid/columns/image/insertImageAction.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ define([
4949
showLoader: true
5050
}).done($.proxy(function (data) {
5151
if (typeof targetElement === 'function') {
52-
targetElement(data.content);
52+
targetElement(data.content, {text: record['title']});
5353
} else if (targetElement.is('textarea')) {
5454
this.insertAtCursor(targetElement.get(0), data.content);
5555
targetElement.focus();

app/code/Magento/Sales/view/adminhtml/web/order/create/giftmessage.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -207,6 +207,7 @@ define([
207207
'margin-top' : topMargin,
208208
'z-index': 1000
209209
});
210+
jQuery(this).closest('.ui-dialog').nextAll('.ui-widget-overlay').css('z-index', 999);
210211
},
211212
close: function () {
212213
jQuery(this).closest('.ui-dialog').removeClass('ui-dialog-active');

lib/web/mage/adminhtml/browser.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -307,7 +307,7 @@ define([
307307
showLoader: true
308308
}).done($.proxy(function (data) {
309309
if (typeof targetEl === 'function') {
310-
targetEl(data);
310+
targetEl(data, {text: fileRow.find('img').attr('alt')});
311311
} else if (targetEl.is('textarea')) {
312312
this.insertAtCursor(targetEl.get(0), data);
313313
} else {

0 commit comments

Comments
 (0)