From c09b5102afbef3e3121e18c56b71d1cb2ae7e9fa Mon Sep 17 00:00:00 2001
From: starfighter83 <unknown@kiln.example.com>
Date: Wed, 23 Feb 2011 09:26:40 -0100
Subject: [PATCH] Fixes: TinyMCE no longer defaults <P> tags around text Work
 Items: 29964

---
 .../umbraco_client/tinymce3/tiny_mce_src.js      | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/umbraco/presentation/umbraco_client/tinymce3/tiny_mce_src.js b/umbraco/presentation/umbraco_client/tinymce3/tiny_mce_src.js
index a0f5b431b1..132db2701a 100644
--- a/umbraco/presentation/umbraco_client/tinymce3/tiny_mce_src.js
+++ b/umbraco/presentation/umbraco_client/tinymce3/tiny_mce_src.js
@@ -5049,16 +5049,22 @@ window.tinymce.dom.Sizzle = Sizzle;
 		},
 
 		setContent : function(h, s) {
+
+
 			var t = this, r = t.getRng(), c, d = t.win.document;
 
 			s = s || {format : 'html'};
 			s.set = true;
 			h = s.content = t.dom.processHTML(h);
 
+           
+
 			// Dispatch before set content event
 			t.onBeforeSetContent.dispatch(t, s);
 			h = s.content;
 
+        
+
 			if (r.insertNode) {
 				// Make caret marker since insertNode places the caret in the beginning of text after insert
 				h += '<span id="__caret">_</span>';
@@ -9276,7 +9282,7 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 				font_size_style_values : 'xx-small,x-small,small,medium,large,x-large,xx-large',
 				apply_source_formatting : 1,
 				directionality : 'ltr',
-				forced_root_block : false,
+				forced_root_block : 'p',
 				valid_elements : '@[id|class|style|title|dir<ltr?rtl|lang|xml::lang|onclick|ondblclick|onmousedown|onmouseup|onmouseover|onmousemove|onmouseout|onkeypress|onkeydown|onkeyup],a[rel|rev|charset|hreflang|tabindex|accesskey|type|name|href|target|title|class|onfocus|onblur],strong/b,em/i,strike,u,#p,-ol[type|compact],-ul[type|compact],-li,br,img[longdesc|usemap|src|border|alt=|title|hspace|vspace|width|height|align],-sub,-sup,-blockquote[cite],-table[border|cellspacing|cellpadding|width|frame|rules|height|align|summary|bgcolor|background|bordercolor],-tr[rowspan|width|height|align|valign|bgcolor|background|bordercolor],tbody,thead,tfoot,#td[colspan|rowspan|width|height|align|valign|bgcolor|background|bordercolor|scope],#th[colspan|rowspan|width|height|align|valign|scope],caption,-div,-span,-code,-pre,address,-h1,-h2,-h3,-h4,-h5,-h6,hr[size|noshade],-font[face|size|color],dd,dl,dt,cite,abbr,acronym,del[datetime|cite],ins[datetime|cite],object[classid|width|height|codebase|*],param[name|value],embed[type|width|height|src|*],script[src|type],map[name],area[shape|coords|href|alt|target],bdo,button,col[align|char|charoff|span|valign|width],colgroup[align|char|charoff|span|valign|width],dfn,fieldset,form[action|accept|accept-charset|enctype|method],input[accept|alt|checked|disabled|maxlength|name|readonly|size|src|type|value|tabindex|accesskey],kbd,label[for],legend,noscript,optgroup[label|disabled],option[disabled|label|selected|value],q[cite],samp,select[disabled|multiple|name|size],small,textarea[cols|rows|disabled|name|readonly],tt,var,big',
 				hidden_input : 1,
 				padd_empty_editor : 1,
@@ -11666,9 +11672,9 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 			ed.onPostProcess.add(padd);
 
 			if (s.forced_root_block) {
-				ed.onInit.add(t.forceRoots, t);
-				ed.onSetContent.add(t.forceRoots, t);
-				ed.onBeforeGetContent.add(t.forceRoots, t);
+				//ed.onInit.add(t.forceRoots, t);
+				//ed.onSetContent.add(t.forceRoots, t);
+				//ed.onBeforeGetContent.add(t.forceRoots, t);
 			}
 		},
 
@@ -11677,7 +11683,7 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
 
 			// Force root blocks when typing and when getting output
 			if (s.forced_root_block) {
-				ed.onBeforeExecCommand.add(t.forceRoots, t);
+				//ed.onBeforeExecCommand.add(t.forceRoots, t);
 				ed.onKeyUp.add(t.forceRoots, t);
 				ed.onPreProcess.add(t.forceRoots, t);
 			}