Ticket #8248: 8248_3.patch

_source/plugins/list/plugin.js

@@ -739 +739 @@
         for ( i in dtd.$listItem )
                 defaultListHtmlFilterRules.elements[ i ] = getExtendNestedListFilter( true );
 
+        // Check if node is block element that recieves text.
+        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() ][ '#' ];
+        }
+
+        // Merge the visual line content at the cursor range into the block.
+        function joinCursorLineToBlock( block, cursor )
+        {
+                // Place cursor at the end of previous block.
+                var newCursor = new CKEDITOR.dom.range( cursor.document );
+                newCursor.moveToElementEditEnd( block );
+
+                // Merge with previous block's content.
+                cursor.enlarge( CKEDITOR.ENLARGE_LIST_ITEM_CONTENTS );
+                var frag = cursor.extractContents();
+
+                // Kill the tail br in extracted.
+                var last = frag.getLast();
+                if ( last && last.type == CKEDITOR.NODE_ELEMENT &&
+                         last.is( 'br' ) )
+                        last.remove();
+
+                // Kill original bogus;
+                var bogus = block.getBogus();
+                bogus && bogus.remove();
+
+                block.append( frag );
+
+                // Remove the original path block if needed.
+                if ( cursor.checkStartOfBlock() &&
+                         cursor.checkEndOfBlock() )
+                {
+                        var path = new CKEDITOR.dom.elementPath( cursor.startContainer );
+                        path.block.remove();
+                }
+
+                // Make fresh selection.
+                newCursor.select();
+
+        }
+
         CKEDITOR.plugins.add( 'list',
         {
                 init : function( editor )
@@ -762 +807 @@
                         // Register the state changing handlers.
                         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 )
+                        {
+                                editor.on( 'key', function( evt )
+                                {
+                                        var key = evt.data.keyCode;
+
+                                        // DEl/BACKSPACE
+                                        if ( editor.mode == 'wysiwyg' && key in { 8 : 1, 46 : 1 } )
+                                        {
+                                                var sel = editor.getSelection(),
+                                                range = sel.getRanges()[ 0 ];
+
+                                                if ( !range.collapsed )
+                                                        return;
+
+                                                var isBackspace = key == 8;
+                                                var body = editor.document.getBody();
+                                                var walker = new CKEDITOR.dom.walker( new CKEDITOR.dom.range( editor.document ) );
+                                                walker.evaluator = nonEmpty;
+
+                                                if ( isBackspace )
+                                                {
+                                                        walker.range.setStartAt( body, CKEDITOR.POSITION_AFTER_START );
+                                                        walker.range.setEnd( range.startContainer, range.startOffset );
+
+                                                        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;
+                                                                joinCursorLineToBlock( walker.lastForward(), range );
+                                                                evt.cancel();
+                                                        }
+                                                }
+                                                else
+                                                {
+                                                        var li = range.startContainer.getAscendant( 'li', 1 );
+                                                        if ( li )
+                                                        {
+                                                                var block = li.getLast( isTextBlock ) || li;
+
+                                                                // Check cursor at the very end of list item.
+                                                                if ( range.checkBoundaryOfElement( block, CKEDITOR.END ) )
+                                                                {
+                                                                        walker.range.setStartAt( li, CKEDITOR.POSITION_AFTER_END );
+                                                                        walker.range.setEndAt( body, CKEDITOR.POSITION_BEFORE_END );
+
+                                                                        var next = walker.next();
+
+                                                                        // Check if following the list are inline or text block.
+                                                                        if ( next && next.type == CKEDITOR.NODE_ELEMENT &&
+                                                                                 ( isTextBlock( next ) || next.getName() in CKEDITOR.dtd.$inline ) )
+                                                                        {
+                                                                                // Put cursor range there.
+                                                                                range = range.clone();
+                                                                                range.moveToElementEditStart( next );
+
+                                                                                joinCursorLineToBlock( block, range );
+                                                                                evt.cancel();
+                                                                        }
+                                                                }
+                                                        }
+                                                }
+                                        }
+                                } );
+                        }
                 },
 
                 afterInit : function ( editor )