Merge pull request #626 from magento-firedrakes/bugfixes

[Firedrakes] Bugfixes: - MAGETWO-55861 [IE11] User can't change/add new Address From Order page - MAGETWO-58617 [GitHub] WYSIWYG editor loses data after show-hide editor #5811
magento · Dec 6, 2016 · 0bb4d6c · 0bb4d6c
2 parents 010156f + cc348dc
commit 0bb4d6c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/lib/web/css/source/components/_modals.less b/lib/web/css/source/components/_modals.less
@@ -189,13 +189,17 @@
         //  If applied, switching outer popup scroll to inner
         &._inner-scroll {
             overflow-y: visible;
+
+            .ie11 &,
             .ie10 &,
             .ie9 & {
                 overflow-y: auto;
             }
 
             .modal-inner-wrap {
                 max-height: 90%;
+
+                .ie11 &,
                 .ie10 &,
                 .ie9 & {
                     max-height: none;

diff --git a/lib/web/mage/adminhtml/wysiwyg/tiny_mce/setup.js b/lib/web/mage/adminhtml/wysiwyg/tiny_mce/setup.js
@@ -329,8 +329,9 @@ define([
 
         encodeDirectives: function(content) {
             // collect all HTML tags with attributes that contain directives
-            return content.gsub(/<([a-z0-9\-\_]+.+?)([a-z0-9\-\_]+=".*?\{\{.+?\}\}.*?".+?)>/i, function(match) {
+            return content.gsub(/<([a-z0-9\-\_]+.+?)([a-z0-9\-\_]+=".*?\{\{.+?\}\}.*?".*?)>/i, function(match) {
                 var attributesString = match[2];
+
                 // process tag attributes string
                 attributesString = attributesString.gsub(/([a-z0-9\-\_]+)="(.*?)(\{\{.+?\}\})(.*?)"/i, function(m) {
                     return m[1] + '="' + m[2] + this.makeDirectiveUrl(Base64.mageEncode(m[3])) + m[4] + '"';