Changeset 1090

Timestamp:

2007-11-19 09:41:48 (9 months ago)

Author:

martinkou

Message:

Fixed #1518 : Fixed the issue where creating lists can sometimes leave an excessive BR node on the previous paragraph.

Files:

• FCKeditor/trunk/editor/_source/classes/fckdomrangeiterator.js (modified) (2 diffs)

FCKeditor/trunk/editor/_source/classes/fckdomrangeiterator.js

@@ -266 +266 @@
                                         removePreviousBr = !splitInfo.WasStartOfBlock ;
                                         removeLastBr = !splitInfo.WasEndOfBlock ;
+                                        FCKDebug.Output( 'removePreviousBr=' + removePreviousBr + ',removeLastBr=' + removeLastBr ) ;
 
                                         // Insert the new block into the DOM.
@@ -286 +287 @@
                 {
                         var previousSibling = block.previousSibling ;
-                        if ( previousSibling && previousSibling.nodeType == 1 && previousSibling.nodeName.toLowerCase() == 'br' )
-                                previousSibling.parentNode.removeChild( previousSibling ) ;
+                        if ( previousSibling && previousSibling.nodeType == 1 )
+                        {
+                                if ( previousSibling.nodeName.toLowerCase() == 'br' )
+                                        previousSibling.parentNode.removeChild( previousSibling ) ;
+                                else if ( previousSibling.lastChild && previousSibling.lastChild.nodeName.IEquals( 'br' ) )
+                                        previousSibling.removeChild( previousSibling.lastChild ) ;
+                        }
                 }