From e4ffd59324afe92f11c1586565aa79c33cd6e357 Mon Sep 17 00:00:00 2001 From: Olga Lytvynenko Date: Fri, 4 Nov 2016 12:19:04 +0200 Subject: [PATCH 1/3] MAGETWO-58617: [GitHub] WYSIWYG editor loses data after show-hide editor #5811 --- lib/web/mage/adminhtml/wysiwyg/tiny_mce/setup.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/web/mage/adminhtml/wysiwyg/tiny_mce/setup.js b/lib/web/mage/adminhtml/wysiwyg/tiny_mce/setup.js index 2c4ab52b896cb..306c9557e6456 100755 --- 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] + '"'; From 96d9ed681b8cdb305db501969bdc25447c17c26d Mon Sep 17 00:00:00 2001 From: Olga Lytvynenko Date: Fri, 4 Nov 2016 12:22:25 +0200 Subject: [PATCH 2/3] MAGETWO-58617: [GitHub] WYSIWYG editor loses data after show-hide editor #5811 --- lib/web/mage/adminhtml/wysiwyg/tiny_mce/setup.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/web/mage/adminhtml/wysiwyg/tiny_mce/setup.js b/lib/web/mage/adminhtml/wysiwyg/tiny_mce/setup.js index 306c9557e6456..057f492509192 100755 --- a/lib/web/mage/adminhtml/wysiwyg/tiny_mce/setup.js +++ b/lib/web/mage/adminhtml/wysiwyg/tiny_mce/setup.js @@ -329,7 +329,7 @@ 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 From 723812d8374096682f656aeff17f39129b174fb2 Mon Sep 17 00:00:00 2001 From: Olga Lytvynenko Date: Fri, 4 Nov 2016 16:46:58 +0200 Subject: [PATCH 3/3] MAGETWO-55861: [IE11] User can't change/add new Address From Order page --- lib/web/css/source/components/_modals.less | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lib/web/css/source/components/_modals.less b/lib/web/css/source/components/_modals.less index daf325efd3a02..ea866d4775ac2 100644 --- a/lib/web/css/source/components/_modals.less +++ b/lib/web/css/source/components/_modals.less @@ -189,6 +189,8 @@ // If applied, switching outer popup scroll to inner &._inner-scroll { overflow-y: visible; + + .ie11 &, .ie10 &, .ie9 & { overflow-y: auto; @@ -196,6 +198,8 @@ .modal-inner-wrap { max-height: 90%; + + .ie11 &, .ie10 &, .ie9 & { max-height: none;