Merge remote-tracking branch 'origin/MAGETWO-52378' into bugfixes

Olexandr Lysenko · Olexandr Lysenko · commit 60b8c5a925d2 · 2016-09-30T19:02:45.000+03:00
diff --git a/lib/web/mage/adminhtml/wysiwyg/tiny_mce/html5-schema.js b/lib/web/mage/adminhtml/wysiwyg/tiny_mce/html5-schema.js
@@ -46,7 +46,7 @@ define([
     };
 
     schema.flowContent = schema.blockContent.concat(schema.phrasingContent, ['style']);
-    schema.nonEmpty = ['td', 'th', 'iframe', 'video', 'audio', 'object', 'script'].concat(schema.shortEnded);
+    schema.nonEmpty = ['td', 'th', 'iframe', 'video', 'audio', 'object', 'script', 'i', 'em', 'span'].concat(schema.shortEnded);
 
     _.extend(schema, (function (phrasingContent, flowContent) {
         var validElements   = [],
diff --git a/lib/web/mage/adminhtml/wysiwyg/tiny_mce/setup.js b/lib/web/mage/adminhtml/wysiwyg/tiny_mce/setup.js
@@ -101,6 +101,8 @@ define([
                 magentoPluginsOptions: magentoPluginsOptions,
                 doctype: '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">',
                 setup: function(ed){
+                    ed.onPreInit.add(self.onEditorPreInit.bind(self));
+
                     ed.onInit.add(self.onEditorInit.bind(self));
 
                     ed.onSubmit.add(function(ed, e) {
@@ -285,10 +287,18 @@ define([
             }
         },
 
-        onEditorInit: function (editor) {
+        /**
+         * Editor pre-initialise event handler.
+         */
+        onEditorPreInit: function (editor) {
             this.applySchema(editor);
         },
 
+        /**
+         * @deprecated
+         */
+        onEditorInit: function () {},
+
         onFormValidation: function() {
             if (tinyMCE.get(this.id)) {
                 $(this.id).value = tinyMCE.get(this.id).getContent();
