Changeset 168

Timestamp:

2007-02-28 16:53:21 (3 years ago)

Author:

fredck

Message:

Fixed #90 : The previous implementation of the "extra <br>" cleanup (related to  http://tinyurl.com/34e892) was buggy. This change should fix it.

Files:

• FCKeditor/trunk/editor/_source/internals/fckxhtml.js (modified) (2 diffs)

FCKeditor/trunk/editor/_source/internals/fckxhtml.js

@@ -125 +125 @@
 {
         // Trim block elements. This is also needed to avoid Firefox leaving extra
-        // BRs at the end of them (check made inside _AppendNode).
+        // BRs at the end of them.
         if ( isBlockElement )
-                FCKDomTools.TrimNode( htmlNode ) ;
+                FCKDomTools.TrimNode( htmlNode, true ) ;
 
         var iCount = 0 ;
@@ -209 +209 @@
                                 return false ;
 
-                        // Remove the <br> if it is a bogus node or is the last child.
-                        if ( sNodeName == 'br' && ( htmlNode.getAttribute( 'type', 2 ) == '_moz' || !htmlNode.nextSibling ) )
+                        // Remove the <br> if it is a bogus node.
+                        if ( sNodeName == 'br' && htmlNode.getAttribute( 'type', 2 ) == '_moz' )
                                 return false ;