Index: /CKEditor/trunk/CHANGES.html
===================================================================
--- /CKEditor/trunk/CHANGES.html (revision 3902)
+++ /CKEditor/trunk/CHANGES.html (revision 3903)
@@ -132,10 +132,11 @@
#3836 : Fixed remove list in enterMode=BR will merge sibling text to one line.
#3949 : Fixed enterKey within pre-formatted text introduce wrong line-break.
- #3878 : Whenever possible,
- dialogs will not present scrollbars if the content is too big for its standard
- size.
+ #3878 : Whenever possible,
+ dialogs will not present scrollbars if the content is too big for its standard
+ size.
+ #3782 : Remove empty list in table cell result in collapsed cell.
Updated the following language files:
- #3837 : Brazilian Portuguese.
-
+
Index: /CKEditor/trunk/_source/plugins/list/plugin.js
===================================================================
--- /CKEditor/trunk/_source/plugins/list/plugin.js (revision 3902)
+++ /CKEditor/trunk/_source/plugins/list/plugin.js (revision 3903)
@@ -117,5 +117,6 @@
currentListItem.append( item.contents[i].clone( true, true ) );
- if ( currentListItem.type == CKEDITOR.NODE_DOCUMENT_FRAGMENT )
+ if ( currentListItem.type == CKEDITOR.NODE_DOCUMENT_FRAGMENT
+ && currentIndex != listArray.length - 1 )
{
if ( currentListItem.getLast()
@@ -345,12 +346,9 @@
editor.document.createElement( 'br' ).insertBefore( firstNode );
- // If groupObj.root is the last element in its parent, or its nextSibling is a
, then we should
- // not add a
after the final item. So, check for the cases and trim the
.
- if ( !groupObj.root.getNext() || groupObj.root.getNext().$.nodeName.toLowerCase() == 'br' )
- {
- if ( newList.listNode.getLast().$.nodeName.toLowerCase() == 'br' )
- newList.listNode.getLast().remove();
- }
+ var rootParent = groupObj.root.getParent();
docFragment.replace( groupObj.root );
+ // The list content might be empty.(#3782)
+ if( !CKEDITOR.env.ie && rootParent )
+ rootParent.appendBogus();
}