Ticket #5402: 5402.patch

_source/plugins/wysiwygarea/plugin.js

@@ -170 +170 @@
                 }
         }
 
+        function isBlankParagraph( block )
+        {
+                return block.getOuterHtml().match( emptyParagraphRegexp );
+        }
+
+        var isNotWhitespace = CKEDITOR.dom.walker.whitespaces( true );
+
         /**
          *  Auto-fixing block-less content by wrapping paragraph (#3190), prevent
          *  non-exitable-block by padding extra br.(#3189)
@@ -204 +211 @@
                                 first && isNbsp( first ) && first.remove();
                         }
 
-                        // If the fixed block is blank and already followed by a exitable
-                        // block, we should revert the fix. (#3684)
-                        if ( fixedBlock.getOuterHtml().match( emptyParagraphRegexp ) )
+                        // If the fixed block is actually blank and is already followed by an exitable blank
+                        // block, we should revert the fix and move into the existed one. (#3684)
+                        if ( isBlankParagraph( fixedBlock ) )
                         {
                                 var previousElement = fixedBlock.getPrevious( isNotWhitespace ),
                                         nextElement = fixedBlock.getNext( isNotWhitespace );
 
                                 if ( previousElement && previousElement.getName
                                          && !( previousElement.getName() in nonExitableElementNames )
+                                         && isBlankParagraph( previousElement )
                                          && range.moveToElementEditStart( previousElement )
                                          || nextElement && nextElement.getName
-                                           && !( nextElement.getName() in nonExitableElementNames )
-                                           && range.moveToElementEditStart( nextElement ) )
+                                                && !( nextElement.getName() in nonExitableElementNames )
+                                                && isBlankParagraph( nextElement )
+                                                && range.moveToElementEditStart( nextElement ) )
                                 {
                                         fixedBlock.remove();
                                 }

_source/plugins/enterkey/plugin.js

@@ -14 +14 @@
                         var specialKeys = editor.specialKeys;
                         specialKeys[ 13 ] = enter;
                         specialKeys[ CKEDITOR.SHIFT + 13 ] = shiftEnter;
+                        specialKeys[ CKEDITOR.CTRL + CKEDITOR.SHIFT + 13 ] = ctrlShiftEnter;
                 }
         });
 
@@ -281 +282 @@
                         range.collapse( true );
 
                         range.select( isPre );
-                }
+                },
+
+                /**
+                 * If the cursor is inside a block, exit from the current block by putting the cursor after the end of it.
+                 * @param editor
+                 */
+                enterExit : function( editor )
+                {
+                        var range = getRange( editor ),
+                                        doc = editor.document,
+                                        path = new CKEDITOR.dom.elementPath( range.startContainer ),
+                                        block = path.block || path.blockLimit;
+
+                        if ( block )
+                        {
+                                var parent;
+                                while( block && ( parent = block.getParent() )
+                                        && !CKEDITOR.dtd[ parent.getName() ][ '#' ] )
+                                {
+                                        block = block.getParent();
+                                }
+
+                                if ( parent )
+                                {
+                                        range.moveToPosition( block, CKEDITOR.POSITION_AFTER_END );
+
+                                        // Insert filler node when cursor is at the end of block
+                                        // or by side of a block.
+                                        var next;
+                                        if ( range.checkEndOfBlock() )
+                                                parent.appendBogus();
+                                        else if ( ( next = block.getNext() ) && next.type == CKEDITOR.NODE_ELEMENT && next.isBlockBoundary()  )
+                                        {
+                                                var filler = CKEDITOR.env.ie ?doc.createText( '\u00a0' ) :
+                                                                CKEDITOR.env.opera ? doc.createText( '' ) :
+                                                                doc.createElement( 'br' );
+
+                                                filler.insertAfter( block );
+                                        }
+                                        
+                                        range.select();
+                                }
+                        }
+                }
         };
 
         var plugin = CKEDITOR.plugins.enterkey,
@@ -321 +365 @@
                 return true;
         }
 
+        function ctrlShiftEnter( editor )
+        {
+                // Use setTimout so the keys get cancelled immediatelly.
+                setTimeout( function()
+                        {
+                                editor.fire( 'saveSnapshot' );  // Save undo step.
+                                CKEDITOR.plugins.enterkey.enterExit( editor );
+                                editor.fire( 'saveSnapshot' );  // Save undo step.
+                        }, 0 );
+        }
 
         function getRange( editor )
         {

_source/core/dom/element.js

@@ -236 +236 @@
 
                 appendBogus : function()
                 {
-                        var lastChild = this.getLast() ;
+                        var nonBookmark = CKEDITOR.dom.walker.bookmark( false, true ),
+                                nonEmptyspaces = CKEDITOR.dom.walker.whitespaces( true ),
+                                evaluator = function( node )
+                                {
+                                        return nonEmptyspaces( node ) && nonBookmark( node )
+                                };
 
-                        // Ignore empty/spaces text.
-                        while ( lastChild && lastChild.type == CKEDITOR.NODE_TEXT && !CKEDITOR.tools.rtrim( lastChild.getText() ) )
-                                lastChild = lastChild.getPrevious();
-                        if ( !lastChild || !lastChild.is || !lastChild.is( 'br' ) )
-                        {
-                                var bogus = CKEDITOR.env.opera ?
-                                                this.getDocument().createText('') :
-                                                this.getDocument().createElement( 'br' );
+                        this.appendBogus = function()
+                        {
+                                var lastChild = this.getLast( evaluator );
+                                if ( !lastChild || !lastChild.is || !lastChild.is( 'br' ) )
+                                {
+                                        var bogus =     CKEDITOR.env.ie ? this.getDocument().createText( '\u00a0' ) :
+                                                        CKEDITOR.env.opera ? this.getDocument().createText('') :
+                                                        this.getDocument().createElement( 'br' );
 
-                                CKEDITOR.env.gecko && bogus.setAttribute( 'type', '_moz' );
+                                        CKEDITOR.env.gecko && bogus.setAttribute( 'type', '_moz' );
 
-                                this.append( bogus );
-                        }
+                                        this.append( bogus );
+                                }
+                        };
+
+                        this.appendBogus();
                 },
 
                 /**