Ticket #6217: 6217_2.patch

_source/plugins/wysiwygarea/plugin.js

@@ -760 +760 @@
                                                         {
                                                                 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,
+                                                                        rtl = keyCode == 8;
 
                                                                 // Override keystrokes which should have deletion behavior
                                                                 //  on fully selected element . (#4047) (#7645)
@@ -779 +784 @@
                                                                         editor.fire( 'saveSnapshot' );
 
                                                                         evt.data.preventDefault();
-                                                                        return;
+                                                                }
+                                                                else
+                                                                {
+                                                                        // Handle the following special cases: (#6217)
+                                                                        // 1. Del/Backspace key before/after table;
+                                                                        // 2.  key after start of table.
+                                                                        if ( ( block = path.block ) &&
+                                                                                 range[ rtl ? 'checkStartOfBlock' : 'checkEndOfBlock' ]() &&
+                                                                                 ( next = block[ rtl ? 'getPrevious' : 'getNext' ]( notWhitespaceEval ) ) &&
+                                                                                 next.is( 'table' ) )
+                                                                        {
+                                                                                editor.fire( 'saveSnapshot' );
+
+                                                                                // Remove the current empty block.
+                                                                                if ( range[ rtl ? 'checkEndOfBlock' : 'checkStartOfBlock' ]() )
+                                                                                        block.remove();
+
+                                                                                // Move cursor to the beginning/end of table cell.
+                                                                                range[ 'moveToElementEdit' + ( rtl ? 'End' : 'Start' ) ]( next );
+                                                                                range.select();
+
+                                                                                editor.fire( 'saveSnapshot' );
+
+                                                                                evt.data.preventDefault();
+                                                                        }
+                                                                        else if ( path.blockLimit.is( 'td' ) &&
+                                                                                          ( parent = path.blockLimit.getAscendant( 'table' ) ) &&
+                                                                                          range.checkBoundaryOfElement( parent, rtl ? CKEDITOR.START : CKEDITOR.END ) &&
+                                                                                          ( next = parent[ rtl ? 'getPrevious' : 'getNext' ]( notWhitespaceEval ) ) )
+                                                                        {
+                                                                                editor.fire( 'saveSnapshot' );
+
+                                                                                // Move cursor to the end of previous block.
+                                                                                range[ 'moveToElementEdit' + ( rtl ? 'End' : 'Start' ) ]( next );
+
+                                                                                // Remove any previous empty block.
+                                                                                if ( range.checkStartOfBlock() && range.checkEndOfBlock() )
+                                                                                        next.remove();
+                                                                                else
+                                                                                        range.select();
+
+                                                                                editor.fire( 'saveSnapshot' );
+
+                                                                                evt.data.preventDefault();
+                                                                        }
+
                                                                 }
                                                         }
 

_source/core/dom/range.js

@@ -349 +349 @@
         // check(Start|End)OfBlock.
         function getCheckStartEndBlockEvalFunction( isStart )
         {
-                var hadBr = false, bookmarkEvaluator = CKEDITOR.dom.walker.bookmark( true );
+                var skipBogus = false,
+                        bookmarkEvaluator = CKEDITOR.dom.walker.bookmark( true ),
+                        nbspRegExp = /^[\t\r\n ]*(?: |\xa0)$/;
+
                 return function( node )
                 {
                         // First ignore bookmark nodes.
@@ -358 +361 @@
 
                         if ( node.type == CKEDITOR.NODE_TEXT )
                         {
+                                // Skip the block filler NBSP.
+                                if ( CKEDITOR.env.ie &&
+                                         nbspRegExp.test( node.getText() ) &&
+                                         !skipBogus &&
+                                         !( isStart && node.getNext() ) )
+                                {
+                                        skipBogus = true;
+                                }
                                 // If there's any visible text, then we're not at the start.
-                                if ( node.hasAscendant( 'pre' ) || CKEDITOR.tools.trim( node.getText() ).length )
+                                else if ( node.hasAscendant( 'pre' ) || CKEDITOR.tools.trim( node.getText() ).length )
                                         return false;
                         }
                         else if ( node.type == CKEDITOR.NODE_ELEMENT )
@@ -368 +379 @@
                                 // at the start.
                                 if ( !inlineChildReqElements[ node.getName() ] )
                                 {
-                                        // If we're working at the end-of-block, forgive the first <br /> in non-IE
-                                        // browsers.
-                                        if ( !isStart && !CKEDITOR.env.ie && node.getName() == 'br' && !hadBr )
-                                                hadBr = true;
+                                        // Skip the padding block br.
+                                        if ( !CKEDITOR.env.ie &&
+                                                 node.is( 'br' ) &&
+                                                 !skipBogus &&
+                                                 !( isStart && node.getNext() ) )
+                                        {
+                                                skipBogus = true;
+                                        }
                                         else
                                                 return false;
                                 }
@@ -1934 +1949 @@
                  */
                 moveToElementEditablePosition : function( el, isMoveToEnd )
                 {
+                        var nbspRegExp = /^[\t\r\n ]*(?:&nbsp;|\xa0)$/;
+
                         function nextDFS( node, childOnly )
                         {
                                 var next;
@@ -1958 +1975 @@
                                 // Stop immediately if we've found a text node.
                                 if ( el.type == CKEDITOR.NODE_TEXT )
                                 {
-                                        this.moveToPosition( el, isMoveToEnd ?
+                                        // Put cursor before block filler.
+                                        if ( isMoveToEnd && this.checkEndOfBlock() && nbspRegExp.test( el.getText() ) )
+                                                this.moveToPosition( el, CKEDITOR.POSITION_BEFORE_START );
+                                        else
+                                                this.moveToPosition( el, isMoveToEnd ?
                                                                  CKEDITOR.POSITION_AFTER_END :
                                                                  CKEDITOR.POSITION_BEFORE_START );
                                         found = 1;
@@ -1975 +1996 @@
                                                                                                  CKEDITOR.POSITION_AFTER_START );
                                                 found = 1;
                                         }
+                                        // Put cursor before padding block br.
+                                        else if ( isMoveToEnd && el.is( 'br' ) && this.checkEndOfBlock() )
+                                                this.moveToPosition( el, CKEDITOR.POSITION_BEFORE_START );
                                 }
 
                                 el = nextDFS( el, found );