Changeset 5602

Timestamp:

06/11/10 19:42:00 (3 years ago)

Author:

garry.yao

Message:

Fixing a bug where one block get processed duplicately on multiple ranges.

File:

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

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

@@ -457 +457 @@
                                 while ( ( block = iterator.getNextParagraph() ) )
                                 {
+                                        // Avoid duplicate blocks get processed across ranges.
+                                        if( block.getCustomData( 'list_block' ) )
+                                                continue;
+                                        else
+                                                CKEDITOR.dom.element.setMarker( database, block, 'list_block', 1 );
+
                                         var path = new CKEDITOR.dom.elementPath( block ),
                                                 pathElements = path.elements,
@@ -476 +482 @@
                                                         // should belong to a different group of paragraphs before
                                                         // the list. (Bug #1309)
-                                                        blockLimit.removeCustomData( 'list_group_object' + index );
+                                                        blockLimit.removeCustomData( 'list_group_object_' + index );
 
                                                         var groupObj = element.getCustomData( 'list_group_object' );
@@ -536 +542 @@
                                                 'getPrevious' : 'getNext' ]( CKEDITOR.dom.walker.whitespaces( true ) );
                                         if ( sibling && sibling.getName &&
-                                             sibling.getName() == listCommand.type )
+                                                 sibling.getName() == listCommand.type )
                                         {
                                                 sibling.remove();