Issue 17731 tinymce (#17786)

* #17731 fixes switching issue * #17731 fixes switching issue
dotCMS · Jan 3, 2020 · 367cf23 · 367cf23
1 parent 2c005d8
commit 367cf23
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/dotCMS/src/main/webapp/html/portlet/ext/contentlet/field/edit_field_js.jsp b/dotCMS/src/main/webapp/html/portlet/ext/contentlet/field/edit_field_js.jsp
@@ -359,12 +359,15 @@ var cmsfile=null;
 				     <%}%>
 				<%}%>
 			<%}%>
-			console.log(textAreaId + "tinyPropOverride", eval(textAreaId + "tinyPropOverride"));
-			
 
+			let tinyConf = eval(textAreaId + "tinyPropOverride");
+			if(tinyConf.plugins != undefined && tinyConf.plugins[2] != undefined){
+			    tinyConf.plugins[2]=tinyConf.plugins[2].replace("compat3x","");
+			}
+            console.log(textAreaId, tinyConf );
 			//Enabling the wysiwyg
 			try {
-                var wellTinyMCE = new tinymce.Editor(textAreaId, eval(textAreaId + "tinyPropOverride"), tinymce.EditorManager);
+                var wellTinyMCE = new tinymce.Editor(textAreaId, tinyConf, tinymce.EditorManager);
 				wellTinyMCE.render();
                 wellTinyMCE.on('change', emmitFieldDataChange);
 			}

diff --git a/dotCMS/src/main/webapp/html/portlet/ext/contentlet/field/tiny_mce_config_default.jsp b/dotCMS/src/main/webapp/html/portlet/ext/contentlet/field/tiny_mce_config_default.jsp
@@ -26,12 +26,12 @@ var tinyMCEProps = {
 			theme: "modern",
 			selector: "textarea",
     		menubar: 'false',
-    		statusbar: true,
+    		statusbar: false,
     		resize: "true",
     		plugins: [
         		"advlist anchor autolink lists link image charmap print  hr anchor ",
         		"searchreplace wordcount visualchars fullscreen ",
-        		"emoticons  paste textcolor colorpicker textpattern validation dotimageclipboard compat3x"
+        		"emoticons  paste textcolor colorpicker textpattern validation dotimageclipboard"
     		],
             block_formats: 'Paragraph=p;Header 1=h1;Header 2=h2;Header 3=h3;Header 4=h4;Header 5=h5;Pre=pre;Code=code;Remove Format=removeformat',