Ticket #3312: 3312_3.patch

_source/plugins/enterkey/plugin.js

@@ -57 +57 @@
         {
                 // Get the range for the current selection.
                 range = range || getRange( editor );
+                
+                // splitBlock may change  the range later.  
+                var orginalRange = range.clone();
 
                 var doc = range.document;
 
@@ -78 +81 @@
 
                 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 +98 @@
                         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 )
+                {
+                        // Create marker node for recording the editable position before list outdentation. 
+                        if( !CKEDITOR.env.ie )
+                        {
+                                var markerNode = 
+                                        CKEDITOR.dom.element.createFromHtml( '<span id="_cke_marker_editable" >&nbsp;</span>' );
+                                node.append( markerNode );
+                        }
+                        var listNode = node.getParent();
+                        listNode = editor.plugins.indent.outdentList( editor, orginalRange, listNode );
+                        if ( !CKEDITOR.env.ie )
+                        {
+                                range.moveToElementEditStart( 
+                                        ( markerNode = editor.document.getById( '_cke_marker_editable' ) ).getParent() );
+                                markerNode.remove();
+                                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/plugins/indent/plugin.js

@@ -275 +275 @@
                         // Register the state changing handlers.
                         editor.on( 'selectionChange', CKEDITOR.tools.bind( onSelectionChange, indent ) );
                         editor.on( 'selectionChange', CKEDITOR.tools.bind( onSelectionChange, outdent ) );
+                        
+                        // Register 'outdent list' as public editor instance function.  
+                        editor.plugins.indent.outdentList= CKEDITOR.tools.bind( indentList, outdent );
+                        
                 },
 
                 requires : [ 'domiterator', 'list' ]
@@ -279 +283 @@
 
                 requires : [ 'domiterator', 'list' ]
         } );
+        
 })();
 
 CKEDITOR.tools.extend( CKEDITOR.config,

_source/core/dom/element.js

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