ENGCOM-5607: Allow TinyMCE to save content with inline <style> tags #24114

Author: sidolov

lib/web/mage/adminhtml/wysiwyg/tiny_mce/plugins/magentovariable/editor_plugin.js

@@ -171,7 +171,8 @@ define([
              * @returns {String}
              */
             decodeVariables: function (content) {
-                var doc = (new DOMParser()).parseFromString(content.replace(/"/g, '"'), 'text/html');
+                var doc = (new DOMParser()).parseFromString(content.replace(/"/g, '"'), 'text/html'),
+                    returnval = '';
 
                 [].forEach.call(doc.querySelectorAll('span.magento-variable'), function (el) {
                     var $el = jQuery(el);
@@ -195,7 +196,12 @@ define([
                     }
                 });
 
-                return doc.body ? doc.body.innerHTML.replace(/"/g, '"') : content;
+                returnval += doc.head.innerHTML ?
+                    doc.head.innerHTML.replace(/"/g, '"') : '';
+                returnval += doc.body.innerHTML ?
+                    doc.body.innerHTML.replace(/"/g, '"') : '';
+
+                return returnval ? returnval : content;
             },
 
             /**

lib/web/mage/adminhtml/wysiwyg/tiny_mce/plugins/magentowidget/editor_plugin.js

@@ -189,7 +189,7 @@ define([
              * @return {String}
              */
             removeDuplicateAncestorWidgetSpanElement: function (content) {
-                var parser, doc;
+                var parser, doc, returnval = '';
 
                 if (!window.DOMParser) {
                     return content;
@@ -212,7 +212,12 @@ define([
                     widgetEl.parentNode.removeChild(widgetEl);
                 });
 
-                return doc.body ? doc.body.innerHTML.replace(/"/g, '"') : content;
+                returnval += doc.head.innerHTML ?
+                    doc.head.innerHTML.replace(/"/g, '"') : '';
+                returnval += doc.body.innerHTML ?
+                    doc.body.innerHTML.replace(/"/g, '"') : '';
+
+                return returnval ? returnval : content;
             },
 
             /**

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

@@ -198,6 +198,7 @@ define([
                 'convert_urls': false,
                 'content_css': this.config.tinymce4['content_css'],
                 'relative_urls': true,
+                'valid_children': '+body[style]',
                 menubar: false,
                 plugins: this.config.tinymce4.plugins,
                 toolbar: this.config.tinymce4.toolbar,