Ticket #9152: 9152.patch

_source/plugins/list/plugin.js

@@ -784 +784 @@
                            CKEDITOR.dtd[ node.getName() ][ '#' ];
         }
 
-        // Merge the visual line content at the cursor range into the block.
+        // Join visually two block lines.
         function joinNextLineToCursor( editor, cursor, nextCursor )
         {
                 editor.fire( 'saveSnapshot' );
@@ -798 +798 @@
 
                 // Kill original bogus;
                 var currentPath = new CKEDITOR.dom.elementPath( cursor.startContainer );
-                var currentLi = currentPath.lastElement.getAscendant( 'li', 1 );
+                var currentBlock = currentPath.lastElement.getAscendant( 'li', 1 ) || currentPath.block;
 
                 var bogus = currentPath.block.getBogus();
                 bogus && bogus.remove();
@@ -815 +815 @@
                 else
                         cursor.startContainer.append( frag );
 
-                var nextPath = new CKEDITOR.dom.elementPath( nextCursor.startContainer );
-                var nextLi = nextCursor.startContainer.getAscendant( 'li', 1 );
+                var nextPath = new CKEDITOR.dom.elementPath( nextCursor.startContainer ),
+                        nextLi = nextCursor.startContainer.getAscendant( 'li', 1 );
 
                 // Move the sub list nested in the next list item.
                 if ( nextLi )
@@ -825 +825 @@
                         if ( sublist )
                         {
                                 // If next line is in the sub list of the current list item.
-                                if ( currentLi.contains( nextLi ) )
+                                if ( currentBlock.contains( nextLi ) )
                                 {
                                         mergeChildren( sublist, nextLi.getParent(), nextLi );
                                         sublist.remove();
                                 }
                                 // Migrate the sub list to current list item.
                                 else
-                                        currentLi.append( sublist );
+                                        currentBlock.append( sublist );
                         }
                 }
 
@@ -922 +922 @@
                                                 var body = editor.document.getBody();
                                                 var walker = new CKEDITOR.dom.walker( range.clone() );
                                                 walker.evaluator = function( node ) { return nonEmpty( node ) && !blockBogus( node ); };
+                                                walker.guard = function( node, isOut ) { return !( isOut && node.type == CKEDITOR.NODE_ELEMENT && node.is( 'table' ) ) };
 
                                                 var cursor = range.clone();
 
@@ -976 +977 @@
                                                 }
                                                 else
                                                 {
-                                                        var li = range.startContainer.getAscendant( 'li', 1 );
+                                                        var next,
+                                                                nextLine,
+                                                                li = range.startContainer.getAscendant( 'li', 1 );
+
                                                         if ( li )
                                                         {
                                                                 walker.range.setEndAt( body, CKEDITOR.POSITION_BEFORE_END );
@@ -1007 +1011 @@
                                                                 if ( isAtEnd && next )
                                                                 {
                                                                         // Put cursor range there.
-                                                                        var nextLine = range.clone();
+                                                                        nextLine = range.clone();
                                                                         nextLine.moveToElementEditStart( next );
 
+                                                                        joinNextLineToCursor( editor, cursor, nextLine );
+                                                                        evt.cancel();
+                                                                }
+                                                        }
+                                                        else
+                                                        {
+                                                                // Handle Del key pressed before list.
+                                                                walker.range.setEndAt( body, CKEDITOR.POSITION_BEFORE_END );
+                                                                next = walker.next();
+                                                                if ( next && next.type == CKEDITOR.NODE_ELEMENT &&
+                                                                     next.getName() in listNodeNames )
+                                                                {
+                                                                        // Put cursor range there.
+                                                                        nextLine = range.clone();
+                                                                        nextLine.moveToElementEditStart( next );
                                                                         joinNextLineToCursor( editor, cursor, nextLine );
                                                                         evt.cancel();
                                                                 }