Ticket #3783: 3783.patch

_source/plugins/list/plugin.js

@@ -486 +486 @@
                                 var mergeSibling, listCommand = this;
                                 ( mergeSibling = function( rtl ){
 
-                                        var sibling = listNode[ rtl ? 'getPrevious' : 'getNext' ].call( listNode, true );
+                                        var sibling = listNode[ rtl ?
+                                                'getPrevious' : 'getNext' ]( CKEDITOR.dom.walker.whitespaces( true ) );
                                         if ( sibling && sibling.getName &&
                                              sibling.getName() == listCommand.type )
                                         {

_source/plugins/wysiwygarea/plugin.js

@@ -166 +166 @@
                         var children = fixedBlock.getChildren(),
                                 count = children.count(),
                                 firstChild,
-                                previousElement = fixedBlock.getPrevious( true ),
-                                nextElement = fixedBlock.getNext( true ),
+                                whitespaceGuard = CKEDITOR.dom.walker.whitespaces( true ),
+                                previousElement = fixedBlock.getPrevious( whitespaceGuard ),
+                                nextElement = fixedBlock.getNext( whitespaceGuard ),
                                 enterBlock;
                         if ( previousElement && previousElement.getName
                                  && !( previousElement.getName() in nonExitableElementNames ) )

_source/core/dom/node.js

@@ -350 +350 @@
                         return node;
                 },
 
-                getPrevious : function( ignoreSpaces )
+                getPrevious : function( guard )
                 {
-                        var previous = this.$.previousSibling;
-                        while ( ignoreSpaces && previous && ( previous.nodeType == CKEDITOR.NODE_TEXT )
-                                        && !CKEDITOR.tools.trim( previous.nodeValue ) )
+                        var previous = this.$;
+                        do
+                        {
                                 previous = previous.previousSibling;
+                        }
+                        while ( previous && guard && !guard( new CKEDITOR.dom.element( previous ) ) )
 
                         return previous ? new CKEDITOR.dom.node( previous ) : null;
                 },
 
                 /**
                  * Gets the node that follows this element in its parent's child list.
-                 * @param {Boolean} ignoreSpaces Whether should ignore empty text nodes.
-                 * @returns {CKEDITOR.dom.node} The next node or null if not
-                 *              available.
+                 * @returns {CKEDITOR.dom.node} The next node or null if not available.
                  * @example
                  * var element = CKEDITOR.dom.element.createFromHtml( '<div><b>Example</b> <i>next</i></div>' );
                  * var first = <b>element.getFirst().getNext()</b>;
                  * alert( first.getName() );  // "i"
                  */
-                getNext : function( ignoreSpaces )
+                getNext : function( guard )
                 {
-                        var next = this.$.nextSibling;
-                        while ( ignoreSpaces && next && ( next.nodeType == CKEDITOR.NODE_TEXT )
-                                  && !CKEDITOR.tools.trim( next.nodeValue ) )
+                        var next = this.$;
+                        do
+                        {
                                 next = next.nextSibling;
+                        }
+                        while ( next && guard && !guard( new CKEDITOR.dom.element( next ) ) )
 
                         return next ? new CKEDITOR.dom.node( next ) : null;
                 },

_source/plugins/domiterator/plugin.js

@@ -287 +287 @@
 
                         if ( removeLastBr )
                         {
+                                // Ignore bookmark nodes.(#3783)
+                                var bookmarkGuard = CKEDITOR.dom.walker.bookmark( false, true );
+
                                 var lastChild = block.getLast();
                                 if ( lastChild && lastChild.type == CKEDITOR.NODE_ELEMENT && lastChild.getName() == 'br' )
                                 {
                                         // Take care not to remove the block expanding <br> in non-IE browsers.
-                                        if ( CKEDITOR.env.ie || lastChild.getPrevious() || lastChild.getNext() )
+                                        if ( CKEDITOR.env.ie
+                                                 || lastChild.getPrevious( bookmarkGuard )
+                                                 || lastChild.getNext( bookmarkGuard ) )
                                                 lastChild.remove();
                                 }
                         }

_source/core/dom/walker.js

@@ -379 +379 @@
 
                 return function( node )
                 {
-                        var retval, parent;
+                        var isBookmark, parent;
                         // Is bookmark inner text node?
-                        retval = ( node && !node.getName && ( parent = node.getParent() )
+                        isBookmark = ( node && !node.getName && ( parent = node.getParent() )
                                                 && isBookmarkNode( parent ) );
                         // Is bookmark node?
-                        retval = contentOnly ? retval : retval || isBookmarkNode( node );
-                        return isReject ? !retval : !!retval;
+                        isBookmark = contentOnly ? isBookmark : isBookmark || isBookmarkNode( node );
+                        return isReject ^ isBookmark;
                 };
         };
 
+        /**
+         * Whether the node contains only white-spaces characters.
+         * @param isReject
+         */
+        CKEDITOR.dom.walker.whitespaces = function( isReject )
+        {
+                return function( node )
+                {
+                        var isWhitespace = node && ( node.type == CKEDITOR.NODE_TEXT )
+                                                        && !CKEDITOR.tools.trim( node.getText() )
+                        return isReject ^ isWhitespace;
+                };
+        }
+
 })();