Ticket #3312: 3312_2.patch

_source/plugins/enterkey/plugin.js

@@ -78 +78 @@
 
                 var node;
 
-                // If this is a block under a list item, split it as well. (#1647)
+                // 1. If this is a block under a list item, split it as well. (#1647)
+                // 2. Exit the whole list if it's the last empty first-level list item. (#3312)
                 if ( nextBlock )
                 {
                         node = nextBlock.getParent();
@@ -94 +95 @@
                         range.moveToElementEditStart( previousBlock.getNext() );
                         previousBlock.move( previousBlock.getPrevious() );
                 }
+                else if ( ( node = previousBlock ) && node.is( 'li' )
+                                        && node.getParent().is( 'ul', 'ol' ) 
+                                        && !node.getNext()
+                                        && !CKEDITOR.tools.trim( node.getText() ).length )
+                {
+                        var editableElement;
+                        // Locate the next content edit-able element of this node.
+                        function getNextEditableElement( node )
+                        {
+                                var walker = new CKEDITOR.dom.walker( node );
+                                walker.evaluator = function( toNode ){
+                                        return ( !!toNode.isEditable && toNode.isEditable() );
+                                };
+                                return walker.next();
+                        }
+                        
+                        if ( editableElement = getNextEditableElement(
+                                                ( node.getLast && node.getLast() )|| node ) )
+                        {
+                                editableElement.scrollIntoView();
+                                range.moveToPosition( editableElement, CKEDITOR.POSITION_AFTER_START );
+                                range.select();
+                        }
 
+                        return;
+                }
                 // If we have both the previous and next blocks, it means that the
                 // boundaries were on separated blocks, or none of them where on the
                 // block limits (start/end).

_source/core/dom/element.js

@@ -547 +547 @@
                  */
                 getText : function()
                 {
-                        return this.$.textContent || this.$.innerText;
+                        return this.$.textContent || this.$.innerText || '';
                 },
 
                 /**

_source/core/dom/text.js

@@ -64 +64 @@
 
                 getText : function()
                 {
-                        return this.$.nodeValue;
+                        return this.$.nodeValue || '';
+                },
+
+                isEditable : function()
+                {       
+                        return true;
+                },
+
+                scrollIntoView : function()
+                {
+                        return this.getParent().scrollIntoView();
                 },
 
                 /**