Ticket #9080: 9080_3.patch

_source/plugins/selection/plugin.js

@@ -589 +589 @@
                                         command : 'selectAll'
                                 });
 
-                        editor.selectionChange = checkSelectionChangeTimeout;
+                        /**
+                         * Check if to fire the {@link CKEDITOR.editor#selectionChange} event
+                         * for the current editor instance.
+                         *
+                         * @param {Boolean} checkNow Check immediately without any delay.
+                         */
+                        editor.selectionChange = function( checkNow )
+                        {
+                                ( checkNow ? checkSelectionChange : checkSelectionChangeTimeout ).call( this );
+                        };
 
                         // IE9 might cease to work if there's an object selection inside the iframe (#7639).
                         CKEDITOR.env.ie9Compat && editor.on( 'destroy', function()

_source/core/dom/walker.js

@@ -455 +455 @@
 
                 return function( node )
                 {
-                        var parent = node.getParent(),
-                                isBogus = !CKEDITOR.env.ie ? node.is && node.is( 'br' ) :
+                        var isBogus = !CKEDITOR.env.ie ? node.is && node.is( 'br' ) :
                                           node.getText && tailNbspRegex.test( node.getText() );
 
-                        isBogus = isBogus && parent.isBlockBoundary() && !!parent.getLast( nonEmpty );
+                        if ( isBogus )
+                        {
+                                var parent = node.getParent(), next = node.getNext( nonEmpty );
+                                isBogus = parent.isBlockBoundary() &&
+                                          ( !next ||
+                                            next.type == CKEDITOR.NODE_ELEMENT &&
+                                            next.isBlockBoundary() );
+                        }
 
                         return !! ( isReject ^ isBogus );
                 };

_source/plugins/indent/plugin.js

@@ -428 +428 @@
                                         }
                                 }
                         });
-
-                        editor.on( 'key', function( evt )
-                        {
-                                // Backspace at the beginning of  list item should outdent it.
-                                if ( editor.mode == 'wysiwyg' && evt.data.keyCode == 8 )
-                                {
-                                        var sel = editor.getSelection(),
-                                                range = sel.getRanges()[ 0 ],
-                                                li;
-
-                                        if ( range.collapsed &&
-                                                 ( li = range.startContainer.getAscendant( 'li', 1 ) ) &&
-                                                 range.checkBoundaryOfElement( li, CKEDITOR.START ) )
-                                        {
-                                                editor.execCommand( 'outdent' );
-                                                evt.cancel();
-                                        }
-                                }
-                        });
                 },
 
                 requires : [ 'domiterator', 'list' ]

_source/plugins/list/plugin.js

@@ -681 +681 @@
 
                         // For all new lists created, merge into adjacent, same type lists.
                         for ( i = 0 ; i < listsCreated.length ; i++ )
-                        {
-                                listNode = listsCreated[i];
-                                var mergeSibling, listCommand = this;
-                                ( mergeSibling = function( rtl )
-                                {
-                                        var sibling = listNode[ rtl ? 'getPrevious' : 'getNext' ]( nonEmpty );
-                                        if ( sibling && sibling.getName &&
-                                                 sibling.getName() == listCommand.type )
-                                        {
-                                                // Move children order by merge direction.(#3820)
-                                                mergeChildren( listNode, sibling, null, !rtl );
+                                mergeListSiblings( listsCreated[ i ] );
+
+                        // Clean up, restore selection and update toolbar button states.
+                        CKEDITOR.dom.element.clearAllMarkers( database );
+                        selection.selectBookmarks( bookmarks );
+                        editor.focus();
+                }
+        };
+
+        // Merge list adjacent, of same type lists.
+        function mergeListSiblings( listNode )
+        {
+                var mergeSibling;
+                ( mergeSibling = function( rtl )
+                {
+                        var sibling = listNode[ rtl ? 'getPrevious' : 'getNext' ]( nonEmpty );
+                        if ( sibling && sibling.is( listNode.getName() ) )
+                        {
+                                // Move children order by merge direction.(#3820)
+                                mergeChildren( listNode, sibling, null, !rtl );
 
-                                                listNode.remove();
-                                                listNode = sibling;
-                                        }
-                                } )();
-                                mergeSibling( 1 );
-                        }
+                                listNode.remove();
+                                listNode = sibling;
+                        }
+                } )();
+                mergeSibling( 1 );
+        }
 
-                        // Clean up, restore selection and update toolbar button states.
-                        CKEDITOR.dom.element.clearAllMarkers( database );
-                        selection.selectBookmarks( bookmarks );
-                        editor.focus();
-                }
-        };
-
         var dtd = CKEDITOR.dtd;
         var tailNbspRegex = /[\t\r\n ]*(?:&nbsp;|\xa0)$/;
 
@@ -788 +790 @@
                 var frag = nextCursor.extractContents();
 
                 cursor.trim( false, true );
+                var bm = cursor.createBookmark();
 
                 // Kill original bogus;
                 var currentPath = new CKEDITOR.dom.elementPath( cursor.startContainer );
@@ -829 +832 @@
                         }
                 }
 
-
-                if ( nextCursor.checkStartOfBlock() &&
+                // Remove any remaining empty path blocks.
+                while ( nextCursor.checkStartOfBlock() &&
                          nextCursor.checkEndOfBlock() )
                 {
-                        var nextBlock = nextPath.block,
-                                parentBlock = nextBlock.getParent();
+                        nextPath = new CKEDITOR.dom.elementPath( nextCursor.startContainer );
+                        var nextBlock = nextPath.block;
 
+                        nextCursor.moveToPosition( nextBlock, CKEDITOR.POSITION_BEFORE_START );
                         nextBlock.remove();
-
-                        // Remove if the path block container is now empty, e.g. li.
-                        if ( parentBlock &&
-                                 !parentBlock.getFirst( nonEmpty ) &&
-                                 !parentBlock.equals( nextPath.blockLimit ) )
-                        {
-                                parentBlock.remove();
-                        }
-                }
+                }
 
+                // Check if need to further merge with the list resides after the merged block. (#9080)
+                var walkerRng = nextCursor.clone(), body = editor.document.getBody();
+                walkerRng.setEndAt( body, CKEDITOR.POSITION_BEFORE_END );
+                var walker = new CKEDITOR.dom.walker( walkerRng );
+                walker.evaluator = function( node ) { return nonEmpty( node ) && !blockBogus( node ); };
+                var next = walker.next();
+                if ( next && next.type == CKEDITOR.NODE_ELEMENT && next.getName() in CKEDITOR.dtd.$list )
+                        mergeListSiblings( next );
+
+                cursor.moveToBookmark( bm );
+
                 // Make fresh selection.
                 cursor.select();
 
+                editor.selectionChange( 1 );
                 editor.fire( 'saveSnapshot' );
         }
 
@@ -883 +891 @@
                         editor.on( 'selectionChange', CKEDITOR.tools.bind( onSelectionChange, numberedListCommand ) );
                         editor.on( 'selectionChange', CKEDITOR.tools.bind( onSelectionChange, bulletedListCommand ) );
 
-                        // [IE8] Fix "backspace" after list and "del" at the end of list item. (#8248)
-                        if ( CKEDITOR.env.ie8Compat )
-                        {
+                                // Handled backspace/del key to join list items. (#8248,#9080)
                                 editor.on( 'key', function( evt )
                                 {
                                         var key = evt.data.keyCode;
@@ -908 +914 @@
 
                                                 if ( isBackspace )
                                                 {
-                                                        walker.range.setStartAt( body, CKEDITOR.POSITION_AFTER_START );
-                                                        walker.range.setEnd( range.startContainer, range.startOffset );
+                                                        var previous, joinWith;
+
+                                                        var path = new CKEDITOR.dom.elementPath( range.startContainer );
+
+                                                        // Join a sub list's first line, with the previous visual line in parent.
+                                                        if ( ( previous = path.contains( listNodeNames ) ) &&
+                                                             range.checkBoundaryOfElement( previous, CKEDITOR.START ) &&
+                                                             ( previous = previous.getParent() ) && previous.is( 'li' ) &&
+                                                             ( previous = getSubList( previous ) ) )
+                                                        {
+                                                                joinWith = previous;
+                                                                previous = previous.getPrevious( nonEmpty );
+                                                                // Place cursor before the nested list.
+                                                                cursor.moveToPosition(
+                                                                        previous && blockBogus( previous ) ? previous : joinWith,
+                                                                        CKEDITOR.POSITION_BEFORE_START );
+                                                        }
+                                                        // Join any line following a list, with the last visual line of the list.
+                                                        else
+                                                        {
+                                                                walker.range.setStartAt( body, CKEDITOR.POSITION_AFTER_START );
+                                                                walker.range.setEnd( range.startContainer, range.startOffset );
+                                                                previous = walker.previous();
 
-                                                        var previous = walker.previous();
-
-                                                        // Check if cursor collapsed right behind of a list.
-                                                        if ( previous &&
-                                                                 previous.type == CKEDITOR.NODE_ELEMENT &&
-                                                                 previous.getName() in listNodeNames )
-                                                        {
-                                                                walker.range.selectNodeContents( previous );
-                                                                walker.reset();
-                                                                walker.evaluator = isTextBlock;
+                                                                if ( previous && previous.type == CKEDITOR.NODE_ELEMENT &&
+                                                                   ( previous.getName() in listNodeNames || previous.is( 'li' ) ) )
+                                                                {
+                                                                        if ( !previous.is( 'li' ) )
+                                                                        {
+                                                                                walker.range.selectNodeContents( previous );
+                                                                                walker.reset();
+                                                                                walker.evaluator = isTextBlock;
+                                                                                previous = walker.previous();
+                                                                        }
 
-                                                                // Place cursor at the end of previous block.
-                                                                cursor.moveToElementEditEnd( walker.lastForward() );
+                                                                        joinWith = previous;
+                                                                        // Place cursor at the end of previous block.
+                                                                        cursor.moveToElementEditEnd( joinWith );
+                                                                }
+                                                        }
+
+                                                        if ( joinWith )
+                                                        {
                                                                 joinNextLineToCursor( editor, cursor, range );
                                                                 evt.cancel();
                                                         }
@@ -969 +1002 @@
                                                                 }
                                                         }
                                                 }
+
+                                                // The backspace/del could potentially put cursor at a bad position,
+                                                // being it handled or not, check immediately the selection to have it fixed.
+                                                setTimeout( function() { editor.selectionChange( 1 ); } );
                                         }
                                 } );
-                        }
                 },
 
                 afterInit : function ( editor )