Merge pull request #7404 from magento-trigger/AC-2066

[Trigger] Bug Fixes
magento · Jan 15, 2022 · b12f867 · b12f867
2 parents f5c555a + f3c5946
commit b12f867
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/...code/Magento/MediaGalleryUi/view/adminhtml/web/js/grid/columns/image/insertImageAction.js b/...code/Magento/MediaGalleryUi/view/adminhtml/web/js/grid/columns/image/insertImageAction.js
@@ -49,7 +49,7 @@ define([
                 showLoader: true
             }).done($.proxy(function (data) {
                 if (typeof targetElement === 'function') {
-                    targetElement(data.content);
+                    targetElement(data.content, {text: record['title']});
                 } else if (targetElement.is('textarea')) {
                     this.insertAtCursor(targetElement.get(0), data.content);
                     targetElement.focus();

diff --git a/app/code/Magento/Sales/view/adminhtml/web/order/create/giftmessage.js b/app/code/Magento/Sales/view/adminhtml/web/order/create/giftmessage.js
@@ -207,6 +207,7 @@ define([
                         'margin-top' : topMargin,
                         'z-index': 1000
                     });
+                    jQuery(this).closest('.ui-dialog').nextAll('.ui-widget-overlay').css('z-index', 999);
                 },
                 close: function () {
                     jQuery(this).closest('.ui-dialog').removeClass('ui-dialog-active');

diff --git a/lib/web/mage/adminhtml/browser.js b/lib/web/mage/adminhtml/browser.js
@@ -307,7 +307,7 @@ define([
                 showLoader: true
             }).done($.proxy(function (data) {
                 if (typeof targetEl === 'function') {
-                    targetEl(data);
+                    targetEl(data, {text: fileRow.find('img').attr('alt')});
                 } else if (targetEl.is('textarea')) {
                     this.insertAtCursor(targetEl.get(0), data);
                 } else {