Ticket #4079: 4079.patch

_source/plugins/wysiwygarea/plugin.js

@@ -189 +189 @@
 
                 // Inserting the padding-br before body if it's preceded by an
                 // unexitable block.
-                var lastNode = body.getLast( true );
+                var lastNode = body.getLast( CKEDITOR.dom.walker.whitespaces( true ) );
                 if ( lastNode && lastNode.getName && ( lastNode.getName() in nonExitableElementNames ) )
                 {
                         var paddingBlock = editor.document.createElement(

_source/core/dom/element.js

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

_source/tests/core/dom/element.html

@@ -524 +524 @@
                         }
                 },
 
+                // Test get last non-spaces child node.
+                test_getLast : function()
+                {
+                        var element = new CKEDITOR.dom.element( document.getElementById( 'append' ) );
+                        var span1 = new CKEDITOR.dom.element( 'span' );
+                        element.append( span1 );
+                        element.append( new CKEDITOR.dom.text( ' ' ) );
+                        element.append( new CKEDITOR.dom.text( ' ' ) );
+                        var last = element.getLast( CKEDITOR.dom.walker.whitespaces( true ) );
+                        assert.areSame( span1.$, last.$ );
+                },
+
+
                 name : document.title
         };
 })() );