Ticket #3190: 3190_5.patch

_source/plugins/wysiwygarea/plugin.js

@@ -114 +114 @@
                                 this.getSelection().lock();
                 }
         }
+        
+        /**
+         *  Auto-fixing block-less content by wrapping paragraph, prevent 
+         *  non-exitable-block by padding extra nodes.
+         */
+        function onSelectionChangeFixBody( evt )
+        {
+                var editor = evt.editor,
+                        path = evt.data.path,
+                        blockLimit = path.blockLimit,
+                        selection = evt.data.selection,
+                        bms = selection.createBookmarks(),
+                        ranges = selection.getRanges(),
+                        range = ranges[ 0 ],
+                        body = editor.document.getBody(),
+                        enterMode = editor.config.enterMode;
+
+                // When enterMode set to block, we'll establing new paragraph if the
+                // current range is block-less within body.
+                if ( enterMode != CKEDITOR.ENTER_BR
+                         && blockLimit.getName() == 'body'
+                         && !path.block )
+                {
+                        var fixedBlock = range.fixBlock( true, 
+                                editor.config.enterMode == CKEDITOR.ENTER_DIV ? 'div' : 'p'  );
+                        
+                        // For IE, if there's only a padding br inside, we'll drop it since now
+                        // we have a block.
+                        if ( CKEDITOR.env.ie && !CKEDITOR.tools.trim( fixedBlock.getText() ) )
+                        {
+                                var children = fixedBlock.getChildren(), child;
+                                for ( var i = 0 ; i <  children.count() ; i++ ) {
+                                        if ( ( child = children.getItem( i ) ) && child.is && child.is( 'br' ) )
+                                                child.remove();
+                                }
+                        }
+                }
+                
+                // Fixing non-exitable blocks when selection inside.
+                if ( path.elements )
+                {
+                        var blockToFix,
+                        blockNext,      // The block following 'blockToFix'.
+                        unexitableBlock = CKEDITOR.tools.clone( CKEDITOR.dtd.$block );
+                        
+                        // Exlude block tag already defined by enterMode, since 'enterkey' behavior
+                        // will help to exit.
+                        if ( enterMode != CKEDITOR.ENTER_BR )
+                                delete unexitableBlock[ enterMode == CKEDITOR.ENTER_P ? 'p' : 'div' ];
+                        
+                        // Find the target block on the path.
+                        var elements = path.elements,
+                                l = elements.length,
+                                element;
+                        for ( var i = 0; i < l ; i++) {
+                                element = elements[ i ];
+                                if ( element.getName && ( element.getName() in unexitableBlock ) )
+                                {
+                                        blockToFix = element;
+                                        break;
+                                }
+                        }
+                        
+                        // Inserting the padding-block-node if it's followed by another
+                        // non-exitable-block OR it reachs document end.
+                        if ( blockToFix &&
+                                typeof ( blockNext = blockToFix.getNext( CKEDITOR.env.ie? false : true ) ) != 'undefined' 
+                                && ( !blockNext ||( blockNext.getName && blockNext.getName() in unexitableBlock ) ) )
+                        {
+                                var paddingBlock = editor.document.createElement( 'br' );
+                                paddingBlock.insertAfter( blockToFix );
+                        }
+                }
+                
+                selection.selectBookmarks( bms );
+        }
 
         CKEDITOR.plugins.add( 'wysiwygarea',
         {
@@ -449 +525 @@
 
                                         editor.on( 'insertHtml', onInsertHtml, null, null, 20 );
                                         editor.on( 'insertElement', onInsertElement, null, null, 20 );
+                                        // Auto fixing on some document structure weakness to enhance usabilities. (#3190 and #3189)
+                                        editor.on( 'selectionChange', onSelectionChangeFixBody, null, null, 1 );
                                 });
                 }
         });

_source/core/dom/node.js

@@ -259 +265 @@
                         return -1;
                 },
 
-                /**
-                 * Gets the node following this node (next sibling).
-                 * @returns {CKEDITOR.dom.node} The next node.
-                 */
-                getNext : function()
-                {
-                        var next = this.$.nextSibling;
-                        return next ? new CKEDITOR.dom.node( next ) : null;
-                },
-
                 getNextSourceNode : function( startFromSibling, nodeType, guard )
                 {
                         var node = ( !startFromSibling && this.getFirst && this.getFirst() ) || this.getNext(),
@@ -349 +345 @@
                 },
 
                 /**
-                 * Gets the node that follows this element in its parent's child list.
+                 * Gets the node following this node (next sibling).
+                 * @param {Boolean} ignoreEmpty Whether should ignore empty text nodes.
                  * @returns {CKEDITOR.dom.node} The next node or null if not
                  *              available.
                  * @example
@@ -357 +354 @@
                  * var first = <b>element.getFirst().getNext()</b>;
                  * alert( first.getName() );  // "i"
                  */
-                getNext : function()
+                getNext : function( ignoreEmpty )
                 {
-                        var $ = this.$.nextSibling;
-                        return $ ? new CKEDITOR.dom.node( $ ) : null;
+                        var next = this.$.nextSibling;
+                        if ( ignoreEmpty && next && ( next.nodeType == CKEDITOR.NODE_TEXT )
+                                  && !CKEDITOR.tools.trim( next.nodeValue ) )
+                                return new CKEDITOR.dom.node( next ).getNext();
+                        else
+                                return next ? new CKEDITOR.dom.node( next ) : null;
                 },
 
                 /**