Changeset 909

Timestamp:

09/29/07 02:09:43 (6 years ago)

Author:

martinkou

Message:

Fixed #1309 : Fixed the issue where inserting a list with a list in the middle of the selection would produce incorrectly ordered lists.

File:

• FCKeditor/trunk/editor/_source/commandclasses/fcklistcommands.js (modified) (3 diffs)

FCKeditor/trunk/editor/_source/commandclasses/fcklistcommands.js

@@ -71 +71 @@
                                 var listNode = null ;
                                 var processedFlag = false ;
+                                var blockLimit = path.BlockLimit ;
 
                                 // First, try to group by a list ancestor.
@@ -78 +79 @@
                                         if ( el.nodeName.IEquals( ['ol', 'ul'] ) )
                                         {
+                                                // If we've encountered a list inside a block limit
+                                                // The last group object of the block limit element should
+                                                // no longer be valid. Since paragraphs after the list
+                                                // should belong to a different group of paragraphs before
+                                                // the list. (Bug #1309)
+                                                if ( blockLimit._FCK_ListGroupObject )
+                                                        blockLimit._FCK_ListGroupObject = null ;
+
                                                 var groupObj = el._FCK_ListGroupObject ;
                                                 if ( groupObj )
@@ -96 +105 @@
 
                                 // No list ancestor? Group by block limit.
-                                var root = path.BlockLimit ;
+                                var root = blockLimit ;
                                 if ( root._FCK_ListGroupObject )
                                         root._FCK_ListGroupObject.contents.push( block ) ;