Ticket #3153: 3153.patch

_source/core/dtd.js

@@ -52 +52 @@
                 O = X({param:1},K),
                 P = X({form:1},A,D,E,I),
                 Q = {li:1};
+        
+        var block = {address:1,blockquote:1,center:1,dir:1,div:1,dl:1,fieldset:1,form:1,h1:1,h2:1,h3:1,h4:1,h5:1,h6:1,hr:1,isindex:1,menu:1,noframes:1,ol:1,p:1,pre:1,table:1,ul:1};
 
     return /** @lends CKEDITOR.dtd */ {
 
@@ -62 +64 @@
                  * @type Object
                  * @example
                  */
-                $block : {address:1,blockquote:1,center:1,dir:1,div:1,dl:1,fieldset:1,h1:1,h2:1,h3:1,h4:1,h5:1,h6:1,hr:1,isindex:1,menu:1,noframes:1,ol:1,p:1,pre:1,table:1,ul:1},
+                $block : block,
 
+                $body : X({script:1}, block),
+
                 /**
                  * List of empty (self-closing) elements, like "br" or "img".
                  * @type Object

_source/core/htmlparser/fragment.js

@@ -50 +50 @@
          * alert( fragment.children[0].name );  "b"
          * alert( fragment.children[1].value );  " Text"
          */
-        CKEDITOR.htmlParser.fragment.fromHtml = function( fragmentHtml )
+        CKEDITOR.htmlParser.fragment.fromHtml = function( fragmentHtml, fixForBody )
         {
                 var parser = new CKEDITOR.htmlParser(),
                         html = [],
@@ -90 +90 @@
 
                 parser.onTagOpen = function( tagName, attributes, selfClosing )
                 {
+                        if ( fixForBody && !currentNode.type && !CKEDITOR.dtd.$body[ tagName ] )
+                                this.onTagOpen( 'p', {} );
+
                         var element = new CKEDITOR.htmlParser.element( tagName, attributes );
 
                         // "isEmpty" will be always "false" for unknown elements, so we
@@ -208 +211 @@
                         }
 
                         checkPending();
+
+                        if ( fixForBody && !currentNode.type )
+                                this.onTagOpen( 'p', {} );
+
                         currentNode.add( new CKEDITOR.htmlParser.text( text ) );
                 };
 

_source/plugins/htmldataprocessor/plugin.js

@@ -124 +124 @@
 
         CKEDITOR.htmlDataProcessor.prototype =
         {
-                toHtml : function( data )
+                toHtml : function( data, fixForBody )
                 {
                         // The source data is already HTML, but we need to clean
                         // it up and apply the filter.
@@ -141 +141 @@
 
                         // Now use our parser to make further fixes to the structure, as
                         // well as apply the filter.
-                        var fragment = CKEDITOR.htmlParser.fragment.fromHtml( div.innerHTML ),
+                        var fragment = CKEDITOR.htmlParser.fragment.fromHtml( div.innerHTML, fixForBody ),
                                 writer = new CKEDITOR.htmlParser.basicWriter();
 
                         fragment.writeHtml( writer, this.dataFilter );
@@ -149 +149 @@
                         return writer.getHtml( true );
                 },
 
-                toDataFormat : function( html )
+                toDataFormat : function( html, fixForBody )
                 {
                         var writer = this.writer,
-                                fragment = CKEDITOR.htmlParser.fragment.fromHtml( html );
+                                fragment = CKEDITOR.htmlParser.fragment.fromHtml( html, fixForBody );
 
                         writer.reset();
 

_source/plugins/wysiwygarea/plugin.js

@@ -289 +289 @@
 
                                                                 // Get the HTML version of the data.
                                                                 if ( editor.dataProcessor )
-                                                                        data = editor.dataProcessor.toHtml( data );
+                                                                        data = editor.dataProcessor.toHtml( data, ( editor.config.enterMode != CKEDITOR.ENTER_BR ) );
 
                                                                 data =
                                                                         editor.config.docType +
@@ -339 +339 @@
                                                                 var data = iframe.$.contentWindow.document.body.innerHTML;
 
                                                                 if ( editor.dataProcessor )
-                                                                        data = editor.dataProcessor.toDataFormat( data );
+                                                                        data = editor.dataProcessor.toDataFormat( data, ( editor.config.enterMode != CKEDITOR.ENTER_BR ) );
 
                                                                 return data;
                                                         },