Ticket #6751: 6751.patch

_source/core/htmlparser/element.js

@@ -127 +127 @@
                                 {
                                         var writer = new CKEDITOR.htmlParser.basicWriter();
                                         CKEDITOR.htmlParser.fragment.prototype.writeChildrenHtml.call( element, writer, filter );
-                                        element.children = new CKEDITOR.htmlParser.fragment.fromHtml( writer.getHtml() ).children;
+                                        element.children = new CKEDITOR.htmlParser.fragment.fromHtml( writer.getHtml(), 0, element.clone() ).children;
                                         isChildrenFiltered = 1;
                                 }
                         };

_source/core/htmlparser/fragment.js

@@ -52 +52 @@
          * 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.
+         * @param {CKEDITOR.htmlParser.element} contextNode Parse the html as the content of this element.
          * @returns CKEDITOR.htmlParser.fragment The fragment created.
          * @example
          * var fragment = CKEDITOR.htmlParser.fragment.fromHtml( '<b>Sample</b> Text' );
          * alert( fragment.children[0].name );  "b"
          * alert( fragment.children[1].value );  " Text"
          */
-        CKEDITOR.htmlParser.fragment.fromHtml = function( fragmentHtml, fixForBody )
+        CKEDITOR.htmlParser.fragment.fromHtml = function( fragmentHtml, fixForBody, contextNode )
         {
                 var parser = new CKEDITOR.htmlParser(),
-                        html = [],
-                        fragment = new CKEDITOR.htmlParser.fragment(),
+                        fragment = contextNode || new CKEDITOR.htmlParser.fragment(),
                         pendingInline = [],
                         pendingBRs = [],
                         currentNode = fragment,
@@ -308 +308 @@
                                 newPendingInline = [],
                                 candidate = currentNode;
 
-                        while ( candidate.type && candidate.name != tagName )
+                        while ( candidate != fragment && candidate.name != tagName )
                         {
                                 // If this is an inline element, add it to the pending list, if we're
                                 // really closing one of the parents element later, they will continue
@@ -324 +324 @@
                                 candidate = candidate.parent;
                         }
 
-                        if ( candidate.type )
+                        if ( candidate != fragment )
                         {
                                 // Add all elements that have been found in the above loop.
                                 for ( i = 0 ; i < pendingAdd.length ; i++ )
@@ -403 +403 @@
                 sendPendingBRs( !CKEDITOR.env.ie && 1 );
 
                 // Close all pending nodes.
-                while ( currentNode.type )
+                while ( currentNode != fragment )
                 {
                         var parent = currentNode.parent,
                                 node = currentNode;