Skip to content

Commit 8a84178

Browse files
Merge pull request #1084 from magento-engcom/2.1-develop-prs
[EngCom] Public Pull Requests - 2.1 - MAGETWO-68903: Backport of MAGETWO-57675 for Magento 2.1: WYSIWYG editor does not show. #6222 #4828 #6815 #9499 - MAGETWO-68902: Backport of MAGETWO-54798 For Magento 2.1: One page checkout - Street Address should highlight red when data is missing #9500
2 parents fa68470 + 1ca426e commit 8a84178

File tree

2 files changed

+5
-1
lines changed

2 files changed

+5
-1
lines changed

app/code/Magento/Checkout/Block/Checkout/AttributeMerger.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -281,7 +281,7 @@ protected function getMultilineFieldConfig($attributeCode, array $attributeConfi
281281
$attributeConfig['validation']
282282
)
283283
: $attributeConfig['validation'],
284-
'additionalClasses' => $isFirstLine ? : 'additional'
284+
'additionalClasses' => $isFirstLine ? 'field' : 'additional'
285285

286286
];
287287
if ($isFirstLine && isset($attributeConfig['default']) && $attributeConfig['default'] != null) {

lib/web/mage/adminhtml/wysiwyg/tiny_mce/setup.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,10 @@ define([
5353
});
5454
}
5555

56+
if (jQuery.isReady) {
57+
tinyMCE.dom.Event.domLoaded = true;
58+
}
59+
5660
tinyMCE.init(this.getSettings(mode));
5761
},
5862

0 commit comments

Comments
 (0)