Ticket #3609: 3609_2.patch

_source/core/htmlparser/fragment.js

@@ -50 +50 @@
         /**
          * Creates a {@link CKEDITOR.htmlParser.fragment} from an HTML string.
          * @param {String} fragmentHtml The HTML to be parsed, filling the fragment.
+         * @param {Number} [fixForBody=false] Wrap body with specified element if needed.
          * @returns CKEDITOR.htmlParser.fragment The fragment created.
          * @example
          * var fragment = CKEDITOR.htmlParser.fragment.fromHtml( '<b>Sample</b> Text' );
@@ -107 +108 @@
 
                                 // Create a <p> in the fragment.
                                 currentNode = target;
-                                parser.onTagOpen( 'p', {} );
+                                parser.onTagOpen( fixForBody, {} );
 
                                 // The new target now is the <p>.
                                 target = currentNode;
@@ -284 +285 @@
                         checkPending();
 
                         if ( fixForBody && !currentNode.type )
-                                this.onTagOpen( 'p', {} );
+                                this.onTagOpen( fixForBody, {} );
 
                         currentNode.add( new CKEDITOR.htmlParser.text( text ) );
                 };
@@ -311 +312 @@
                         if ( fixForBody && !parent.type && !CKEDITOR.dtd.$body[ node.name ] )
                         {
                                 currentNode = parent;
-                                parser.onTagOpen( 'p', {} );
+                                parser.onTagOpen( fixForBody, {} );
                                 parent = currentNode;
                         }
 

_source/plugins/wysiwygarea/plugin.js

@@ -1 @@
-/*
+/*
 Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
@@ -404 +404 @@
 
                                                                 // Get the HTML version of the data.
                                                                 if ( editor.dataProcessor )
-                                                                        data = editor.dataProcessor.toHtml( data, ( editor.config.enterMode != CKEDITOR.ENTER_BR ) );
+                                                                {
+                                                                        var fixForBody = ( editor.config.enterMode != CKEDITOR.ENTER_BR )
+                                                                                ? editor.config.enterMode == CKEDITOR.ENTER_DIV ? 'div' : 'p' : false;
+                                                                        data = editor.dataProcessor.toHtml( data, fixForBody );
+                                                                }
 
                                                                 data =
                                                                         editor.config.docType +