Ticket #8248: 8248.patch

_source/plugins/list/plugin.js

@@ -729 +729 @@
         for ( i in dtd.$listItem )
                 defaultListHtmlFilterRules.elements[ i ] = getExtendNestedListFilter( true );
 
+        function isTextBlock( node )
+        {
+                return node.type == CKEDITOR.NODE_ELEMENT &&
+                           ( node.getName() in CKEDITOR.dtd.$block ||
+                                 node.getName() in CKEDITOR.dtd.$listItem ) &&
+                           CKEDITOR.dtd[ node.getName() ][ '#' ];
+        }
+
         CKEDITOR.plugins.add( 'list',
         {
                 init : function( editor )
@@ -752 +760 @@
                         // Register the state changing handlers.
                         editor.on( 'selectionChange', CKEDITOR.tools.bind( onSelectionChange, numberedListCommand ) );
                         editor.on( 'selectionChange', CKEDITOR.tools.bind( onSelectionChange, bulletedListCommand ) );
+
+                        // [IE8] Fix backspace right after the list. (#8248)
+                        if ( CKEDITOR.env.ie8Compat )
+                        {
+                                editor.on( 'key', function( evt )
+                                {
+                                        if ( editor.mode == 'wysiwyg' && evt.data.keyCode == 8 )
+                                        {
+                                                var sel = editor.getSelection(),
+                                                range = sel.getRanges()[ 0 ];
+
+                                                var walkerRange = new CKEDITOR.dom.range( editor.document );
+                                                var body = editor.document.getBody();
+                                                walkerRange.setStartAt( body,
+                                                                                                CKEDITOR.POSITION_AFTER_START );
+                                                walkerRange.setEnd( range.startContainer,
+                                                                                        range.startOffset );
+
+                                                var walker = new CKEDITOR.dom.walker( walkerRange );
+                                                walker.evaluator = nonEmpty;
+
+                                                var previous = walker.previous();
+
+                                                // Check if cursor collapsed right behind of a list.
+                                                if ( range.collapsed &&
+                                                         previous &&
+                                                         previous.type == CKEDITOR.NODE_ELEMENT &&
+                                                         previous.getName() in listNodeNames )
+                                                {
+                                                        walkerRange.selectNodeContents( previous );
+                                                        walker.reset();
+                                                        walker.evaluator = isTextBlock;
+                                                        var previousBlock = walker.lastForward();
+
+                                                        // Place cursor at the end of previous block.
+                                                        var cursor = new CKEDITOR.dom.range( editor.document );
+                                                        cursor.moveToElementEditEnd( previousBlock );
+
+                                                        // Merge with previous block's content.
+                                                        range.enlarge( CKEDITOR.ENLARGE_LIST_ITEM_CONTENTS );
+                                                        var frag = range.extractContents();
+
+                                                        // Kill the tail br in extracted.
+                                                        var last = frag.getLast();
+                                                        if ( last.type == CKEDITOR.NODE_ELEMENT && last.is( 'br' ) )
+                                                                last.remove();
+
+                                                        // Kill original bogus;
+                                                        var bogus = previousBlock.getBogus();
+                                                        bogus && bogus.remove();
+
+                                                        previousBlock.append( frag );
+
+                                                        // Remove the original path block if needed.
+                                                        if ( range.checkStartOfBlock() &&
+                                                                 range.checkEndOfBlock() )
+                                                        {
+                                                                var path = new CKEDITOR.dom.elementPath( range.startContainer );
+                                                                path.block.remove();
+                                                        }
+
+                                                        // Make fresh selection.
+                                                        cursor.select();
+                                                        evt.cancel();
+                                                }
+                                        }
+                                } );
+
+                        }
                 },
 
                 afterInit : function ( editor )