Skip to content

Commit b2dad9e

Browse files
authored
Merge branch '2.4.4-develop' into gl_pr_jan13_2022_latest
2 parents 8743703 + b12f867 commit b2dad9e

File tree

5 files changed

+11
-17
lines changed

5 files changed

+11
-17
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');

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161
"laminas/laminas-view": "~2.14.1",
6262
"league/flysystem": "~2.3.2",
6363
"league/flysystem-aws-s3-v3": "^2.0",
64-
"magento/composer": "1.8.x-dev as 1.8.0",
64+
"magento/composer": "~1.8.0",
6565
"magento/composer-dependency-version-audit-plugin": "~0.1",
6666
"magento/magento-composer-installer": "0.3.*@beta",
6767
"magento/zendframework1": "1.14.6-beta2 as 1.14.6",

composer.lock

Lines changed: 7 additions & 14 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

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)