Ticket #6217: 6217.patch

_source/plugins/wysiwygarea/plugin.js

@@ -751 +751 @@
                                                         {
                                                                 var sel = editor.getSelection(),
                                                                         selected = sel.getSelectedElement(),
-                                                                        range  = sel.getRanges()[ 0 ];
+                                                                        range = sel.getRanges()[ 0 ],
+                                                                        path = new CKEDITOR.dom.elementPath( range.startContainer ),
+                                                                        block,
+                                                                        parent,
+                                                                        next,
+                                                                        previous;
 
                                                                 // Override keystrokes which should have deletion behavior
                                                                 //  on fully selected element . (#4047) (#7645)
@@ -770 +775 @@
                                                                         editor.fire( 'saveSnapshot' );
 
                                                                         evt.data.preventDefault();
-                                                                        return;
+                                                                }
+                                                                else
+                                                                {
+                                                                        // Handle the following special cases: (#6217)
+                                                                        // 1. Del key before table;
+                                                                        // 2. Backspace key after start of table.
+                                                                        if ( keyCode == 46 &&
+                                                                                 ( block = path.block ) &&
+                                                                                 range.checkEndOfBlock() &&
+                                                                                 ( next = block.getNext( notWhitespaceEval ) ) &&
+                                                                                 next.is( 'table' ) )
+                                                                        {
+                                                                                editor.fire( 'saveSnapshot' );
+
+                                                                                // Remove the current empty block.
+                                                                                if ( range.checkStartOfBlock() )
+                                                                                        block.remove();
+
+                                                                                // Move cursor to the beginning of table cell.
+                                                                                range.moveToElementEditStart( next );
+                                                                                range.select();
+
+                                                                                editor.fire( 'saveSnapshot' );
+
+                                                                                evt.data.preventDefault();
+                                                                        }
+                                                                        else if ( keyCode == 8 &&
+                                                                                          path.blockLimit.is( 'td' ) &&
+                                                                                          ( parent = path.blockLimit.getAscendant( 'table' ) ) &&
+                                                                                          range.checkBoundaryOfElement( parent, CKEDITOR.START ) &&
+                                                                                          ( previous = parent.getPrevious( notWhitespaceEval ) ) )
+                                                                        {
+                                                                                editor.fire( 'saveSnapshot' );
+
+                                                                                // Move cursor to the end of previous block.
+                                                                                range.moveToElementEditEnd( previous );
+
+                                                                                // Remove any previous empty block.
+                                                                                if ( range.checkStartOfBlock() && range.checkEndOfBlock() )
+                                                                                        previous.remove();
+                                                                                else
+                                                                                        range.select();
+
+                                                                                editor.fire( 'saveSnapshot' );
+
+                                                                                evt.data.preventDefault();
+                                                                        }
+
                                                                 }
                                                         }
 

_source/core/dom/range.js

@@ -1975 +1975 @@
                                                                                                  CKEDITOR.POSITION_AFTER_START );
                                                 found = 1;
                                         }
+                                        // Move before bogus br.
+                                        else if ( isMoveToEnd && el.is( 'br' ) && this.checkEndOfBlock() )
+                                                this.moveToPosition( el, CKEDITOR.POSITION_BEFORE_START );
                                 }
 
                                 el = nextDFS( el, found );