Changeset 7549

Timestamp:

07/06/12 17:40:12 (11 months ago)

Author:

garry.yao

Message:

#9105: Fixed inadequate cleanup after joining list item with previous on Backspace key.

File:

• CKEditor/trunk/_source/plugins/list/plugin.js (modified) (1 diff)

CKEditor/trunk/_source/plugins/list/plugin.js

@@ -836 +836 @@
                 }
 
-                // Remove any remaining empty path blocks.
+                // Remove any remaining empty path blocks at next line after merging.
                 while ( nextCursor.checkStartOfBlock() &&
                          nextCursor.checkEndOfBlock() )
                 {
                         nextPath = new CKEDITOR.dom.elementPath( nextCursor.startContainer );
-                        var nextBlock = nextPath.block;
+                        var nextBlock = nextPath.block, parent;
+
+                        // Check if also to remove empty list.
+                        if ( nextBlock.is( 'li' ) )
+                        {
+                                parent = nextBlock.getParent();
+                                if ( nextBlock.equals( parent.getLast( nonEmpty ) )
+                                                && nextBlock.equals( parent.getFirst( nonEmpty ) ) )
+                                        nextBlock = parent;
+                        }
 
                         nextCursor.moveToPosition( nextBlock, CKEDITOR.POSITION_BEFORE_START );