Changeset 5103

Timestamp:

02/12/10 13:15:22 (3 years ago)

Author:

fredck

Message:

#4886 : Extra BR tags where being created in the output HTML.

Location:

CKEditor/trunk

Files:

• CHANGES.html (modified) (1 diff)
• _source/core/htmlparser/fragment.js (modified) (9 diffs)

CKEditor/trunk/CHANGES.html

@@ -89 +89 @@
                 <li><a href="http://dev.fckeditor.net/ticket/4893">#4893</a> : Editor should understand table cell inline styles.</li>
                 <li><a href="http://dev.fckeditor.net/ticket/4611">#4611</a> : Selection around &lt;select&gt; in editor doesn't anymore cause error.</li>
+                <li><a href="http://dev.fckeditor.net/ticket/4886">#4886</a> : Extra BR tags where being created in the output HTML.</li>
                 <li>Updated the following language files:<ul>
                         <li><a href="http://dev.fckeditor.net/ticket/5006">#5006</a> : Dutch;</li>

CKEditor/trunk/_source/core/htmlparser/fragment.js

@@ -65 +65 @@
                         fragment = new CKEDITOR.htmlParser.fragment(),
                         pendingInline = [],
+                        pendingBRs = [],
                         currentNode = fragment,
                     // Indicate we're inside a <pre> element, spaces should be touched differently.
@@ -72 +73 @@
                 function checkPending( newTagName )
                 {
+                        var pendingBRsSent;
+
                         if ( pendingInline.length > 0 )
                         {
@@ -83 +86 @@
                                         if ( ( !currentDtd || currentDtd[ pendingName ] ) && ( !newTagName || !pendingDtd || pendingDtd[ newTagName ] || !CKEDITOR.dtd[ newTagName ] ) )
                                         {
+                                                if ( !pendingBRsSent )
+                                                {
+                                                        sendPendingBRs();
+                                                        pendingBRsSent = 1;
+                                                }
+
                                                 // Get a clone for the pending element.
                                                 pendingElement = pendingElement.clone();
@@ -98 +107 @@
                                 }
                         }
+                }
+
+                function sendPendingBRs()
+                {
+                        while ( pendingBRs.length )
+                                currentNode.add( pendingBRs.shift() );
                 }
 
@@ -182 +197 @@
                         }
 
+                        if ( tagName == 'br' )
+                        {
+                                pendingBRs.push( element );
+                                return;
+                        }
+
                         var currentName = currentNode.name;
 
@@ -309 +330 @@
                                 currentNode = candidate;
 
-                                if( currentNode.name == 'pre' )
+                                if ( currentNode.name == 'pre' )
                                         inPre = false;
+
+                                if ( candidate._.isBlockLike )
+                                        sendPendingBRs();
 
                                 addElement( candidate, candidate.parent );
@@ -322 +346 @@
                         }
 
-                        if( tagName == 'body' )
+                        if ( tagName == 'body' )
                                 fixForBody = false;
                 };
@@ -337 +361 @@
                         }
 
+                        sendPendingBRs();
                         checkPending();
 
@@ -366 +391 @@
                 // Parse it.
                 parser.parse( fragmentHtml );
+
+                sendPendingBRs();
 
                 // Close all pending nodes.