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
magento · May 8, 2017 · 8a84178 · 8a84178
2 parents fa68470 + 1ca426e
commit 8a84178
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/app/code/Magento/Checkout/Block/Checkout/AttributeMerger.php b/app/code/Magento/Checkout/Block/Checkout/AttributeMerger.php
@@ -281,7 +281,7 @@ protected function getMultilineFieldConfig($attributeCode, array $attributeConfi
                         $attributeConfig['validation']
                     )
                     : $attributeConfig['validation'],
-                'additionalClasses' => $isFirstLine ? : 'additional'
+                'additionalClasses' => $isFirstLine ? 'field' : 'additional'
 
             ];
             if ($isFirstLine && isset($attributeConfig['default']) && $attributeConfig['default'] != null) {

diff --git a/lib/web/mage/adminhtml/wysiwyg/tiny_mce/setup.js b/lib/web/mage/adminhtml/wysiwyg/tiny_mce/setup.js
@@ -53,6 +53,10 @@ define([
                 });
             }
 
+            if (jQuery.isReady) {
+                tinyMCE.dom.Event.domLoaded = true;
+            }
+
             tinyMCE.init(this.getSettings(mode));
         },
-Original file line number
+Diff line change
@@ Expand Up / @@ -53,6 +53,10 @@ define([ @@
                     });
                 }
+                if (jQuery.isReady) {
+                    tinyMCE.dom.Event.domLoaded = true;
+                }
                 tinyMCE.init(this.getSettings(mode));
             },
@@ Expand Down @@