Ticket #3189: 3189_2.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 br.
+         */
+        function onSelectionChangeFixBody( evt )
+        {
+                var editor = evt.editor,
+                        path = evt.data.path,
+                        blockLimit = path.blockLimit,
+                        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 range = evt.data.selection.getRanges()[0],
+                                fixedBlock = range.fixBlock( true,
+                                editor.config.enterMode == CKEDITOR.ENTER_DIV ? 'div' : 'p'  );
+
+                        // For IE, we'll be removing any bogus br ( introduce by fixing body )
+                        // right now to prevent it introducing visual line break.
+                        if ( CKEDITOR.env.ie )
+                        {
+                                var children = fixedBlock.getChildren(), child;
+                                for ( var i = 0 ; i <  children.count() ; i++ ) {
+                                        if ( ( child = children.getItem( i ) ) && child.is
+                                                        && child.is( 'br' ) && child.hasAttribute( '_cke_bogus' ) )
+                                                child.remove();
+                                }
+                        }
+
+                        // It's been guaranteed we're always at the beginning of text in this case.
+                        range.moveToElementEditStart( fixedBlock );
+                        range.select();
+                }
+
+                // Inserting the padding-br before body if it's preceded by an
+                // unexitable block.
+                var lastNode = body.getLast( true );
+                if ( lastNode.getName && ( lastNode.getName() in CKEDITOR.dtd.$nonExitable ) )
+                {
+                        var paddingBlock = editor.document.createElement(
+                                        ( CKEDITOR.env.ie && enterMode != CKEDITOR.ENTER_BR ) ?
+                                                '<br _cke_bogus="true" />' : 'br' );
+                        body.append( paddingBlock );
+                }
+        }
+
         CKEDITOR.plugins.add( 'wysiwygarea',
         {
                 requires : [ 'editingblock' ],
@@ -449 +500 @@
 
                                         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/element.js

@@ -643 +643 @@
                         return $ ? new CKEDITOR.dom.node( $ ) : null;
                 },
 
-                getLast : function()
+                /**
+                 * @param ignoreEmpty Skip empty text nodes.
+                 */
+                getLast : function( ignoreEmpty )
                 {
                         var $ = this.$.lastChild;
-                        return $ ? new CKEDITOR.dom.node( $ ) : null;
+                        if ( ignoreEmpty && $ && ( $.nodeType == CKEDITOR.NODE_TEXT )
+                                        && !CKEDITOR.tools.trim( $.nodeValue ) )
+                                return new CKEDITOR.dom.node( $ ).getPrevious( true );
+                        else
+                                return $ ? new CKEDITOR.dom.node( $ ) : null;
                 },
 
                 getStyle : function( name )

_source/core/dom/node.js

@@ -259 +259 @@
                         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 )
                 {
                         // If "guard" is a node, transform it in a function.
@@ -360 +350 @@
                         return node;
                 },
 
-                getPrevious : function()
+                getPrevious : function( ignoreEmpty )
                 {
                         var previous = this.$.previousSibling;
-                        return previous ? new CKEDITOR.dom.node( previous ) : null;
+                        if ( ignoreEmpty && previous && ( previous.nodeType == CKEDITOR.NODE_TEXT )
+                                        && !CKEDITOR.tools.trim( previous.nodeValue ) )
+                                return new CKEDITOR.dom.node( previous ).getPrevious();
+                        else
+                                return previous ? new CKEDITOR.dom.node( previous ) : null;
                 },
 
                 /**
                  * Gets the node that follows this element in its parent's child list.
+                 * @param {Boolean} ignoreEmpty Whether should ignore empty text nodes.
                  * @returns {CKEDITOR.dom.node} The next node or null if not
                  *              available.
                  * @example
@@ -375 +370 @@
                  * 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;
                 },
 
                 /**

_source/core/dtd.js

@@ -113 +113 @@
                  */
                 $tableContent : {caption:1,col:1,colgroup:1,tbody:1,td:1,tfoot:1,th:1,thead:1,tr:1},
 
+            /**
+             * List of elements in which has no way to move editing focus outside.
+             */
+            $nonExitable :{table:1,pre:1},
+
         col : {},
         tr : {td:1,th:1},
         img : {},

_source/core/dom/range.js

@@ -31 +31 @@
         // V2
         var execContentsAction = function( range, action, docFrag )
         {
+                range.optimizeBookmark();
+                
                 var startNode   = range.startContainer;
                 var endNode             = range.endContainer;
 
@@ -653 +655 @@
                         }
                 },
 
+                /**
+                 * Move the range out of bookmark nodes if they're been the container.
+                 */
+                optimizeBookmark: function()
+                {
+                        var startNode = this.startContainer,
+                                endNode = this.endContainer;
+
+                        if ( startNode.is && startNode.is( 'span' )
+                                && startNode.hasAttribute( '_fck_bookmark' ) )
+                                this.setStartAt( startNode, CKEDITOR.POSITION_BEFORE_START );
+                        if ( endNode && endNode.is && endNode.is( 'span' )
+                                && endNode.hasAttribute( '_fck_bookmark' ) )
+                                this.setEndAt( endNode,  CKEDITOR.POSITION_AFTER_END );
+                },
+
                 trim : function( ignoreStart, ignoreEnd )
                 {
                         var startContainer = this.startContainer;
@@ -1136 +1154 @@
                  */
                 insertNode : function( node )
                 {
+                        this.optimizeBookmark();
                         this.trim( false, true );
 
                         var startContainer = this.startContainer;