Changeset 5601

Timestamp:

06/11/10 19:33:39 (3 years ago)

Author:

garry.yao

Message:

Revert incorrect changeset [5600].

File:

• CKEditor/branches/features/contenteditable/_source/plugins/list/plugin.js (modified) (3 diffs)

CKEditor/branches/features/contenteditable/_source/plugins/list/plugin.js

@@ -433 +433 @@
                         // Group the blocks up because there are many cases where multiple lists have to be created,
                         // or multiple lists have to be cancelled.
-                        var database = {},
+                        var listGroups = [],
+                                database = {},
                                 rangeIterator = ranges.createIterator(),
                                 index = 0;
@@ -439 +440 @@
                         while ( ( range = rangeIterator.getNextRange() ) && ++index )
                         {
-                                var listGroups = [];
                                 var boundaryNodes = range.getBoundaryNodes(),
                                         startNode = boundaryNodes.startNode,
@@ -506 +506 @@
                                         }
                                 }
-
-                                // Now we have two kinds of list groups, groups rooted at a list, and groups rooted at a block limit element.
-                                // We either have to build lists or remove lists, for removing a list does not makes sense when we are looking
-                                // at the group that's not rooted at lists. So we have three cases to handle.
-                                var listsCreated = [];
-                                while ( listGroups.length > 0 )
-                                {
-                                        groupObj = listGroups.shift();
-                                        if ( this.state == CKEDITOR.TRISTATE_OFF )
-                                        {
-                                                if ( listNodeNames[ groupObj.root.getName() ] )
-                                                        changeListType.call( this, editor, groupObj, database, listsCreated );
-                                                else
-                                                        createList.call( this, editor, groupObj, listsCreated );
-                                        }
-                                        else if ( this.state == CKEDITOR.TRISTATE_ON && listNodeNames[ groupObj.root.getName() ] )
-                                                removeList.call( this, editor, groupObj, database );
-                                }
-
-                                // For all new lists created, merge adjacent, same type lists.
-                                for ( i = 0 ; i < listsCreated.length ; i++ )
-                                {
-                                        listNode = listsCreated[i];
-                                        var mergeSibling, listCommand = this;
-                                        ( mergeSibling = function( rtl ){
-
-                                                var sibling = listNode[ rtl ?
-                                                        'getPrevious' : 'getNext' ]( CKEDITOR.dom.walker.whitespaces( true ) );
-                                                if ( sibling && sibling.getName &&
-                                                         sibling.getName() == listCommand.type )
-                                                {
-                                                        sibling.remove();
-                                                        // Move children order by merge direction.(#3820)
-                                                        sibling.moveChildren( listNode, rtl ? true : false );
-                                                }
-                                        } )();
-                                        mergeSibling( true );
-                                }
-
+                        }
+
+                        // Now we have two kinds of list groups, groups rooted at a list, and groups rooted at a block limit element.
+                        // We either have to build lists or remove lists, for removing a list does not makes sense when we are looking
+                        // at the group that's not rooted at lists. So we have three cases to handle.
+                        var listsCreated = [];
+                        while ( listGroups.length > 0 )
+                        {
+                                groupObj = listGroups.shift();
+                                if ( this.state == CKEDITOR.TRISTATE_OFF )
+                                {
+                                        if ( listNodeNames[ groupObj.root.getName() ] )
+                                                changeListType.call( this, editor, groupObj, database, listsCreated );
+                                        else
+                                                createList.call( this, editor, groupObj, listsCreated );
+                                }
+                                else if ( this.state == CKEDITOR.TRISTATE_ON && listNodeNames[ groupObj.root.getName() ] )
+                                        removeList.call( this, editor, groupObj, database );
+                        }
+
+                        // For all new lists created, merge adjacent, same type lists.
+                        for ( i = 0 ; i < listsCreated.length ; i++ )
+                        {
+                                listNode = listsCreated[i];
+                                var mergeSibling, listCommand = this;
+                                ( mergeSibling = function( rtl ){
+
+                                        var sibling = listNode[ rtl ?
+                                                'getPrevious' : 'getNext' ]( CKEDITOR.dom.walker.whitespaces( true ) );
+                                        if ( sibling && sibling.getName &&
+                                             sibling.getName() == listCommand.type )
+                                        {
+                                                sibling.remove();
+                                                // Move children order by merge direction.(#3820)
+                                                sibling.moveChildren( listNode, rtl ? true : false );
+                                        }
+                                } )();
+                                mergeSibling( true );
                         }