Ticket #3473: 3473.patch

_source/core/dom/element.js

@@ -239 +239 @@
                         var lastChild = this.getLast() ;
 
                         // Ignore empty/spaces text.
-                        while ( lastChild && lastChild.type == CKEDITOR.NODE_TEXT && !CKEDITOR.tools.rtrim( lastChild.getText() ) )
+                        while ( lastChild && lastChild.type == CKEDITOR.NODE_TEXT 
+                                && !CKEDITOR.tools.rtrim( lastChild.getText() || '' ) )
                                 lastChild = lastChild.getPrevious();
 
-                        if ( !lastChild || ( lastChild.is && ( !lastChild.is( 'br' ) || !lastChild.getAttribute( '_cke_bogus' ) ) ) )
+                        // Padding br already existed? 
+                        if ( !lastChild || ( lastChild.is && !lastChild.is( 'br' ) ) )
                         {
-                                this.append(
-                                        CKEDITOR.env.opera ?
-                                                this.getDocument().createText('') :
-                                                this.getDocument().createElement( 'br', { attributes : { _cke_bogus : 1 } } ) );
+                                // See whether the block has some line content, 
+                                // empty spaces are ingnored since it's unable to establish line height.
+                                if ( !CKEDITOR.tools.trim( this.getText() || '' ) )
+                                        this.append( this.getDocument().createElement( 'br', { attributes : { _cke_bogus : 1 } } ) );
                         }
                 },
 
@@ -666 +668 @@
                 {
                         return this.$.style[ CKEDITOR.tools.cssStyleToDomStyle( name ) ];
                 },
-
+                
                 /**
                  * Checks if the element name matches one or more names.
                  * @param {String} name[,name[,...]] One or more names to be checked.
@@ -1165 +1167 @@
                         if ( CKEDITOR.env.gecko && !CKEDITOR.env.quirks )
                         {
                                 x += this.$.clientLeft ? 1 : 0;
-                                y += this.$.clientTop ? 1 : 0;;
+                                y += this.$.clientTop ? 1 : 0;
                         }
 
                         return { x : x, y : y };
@@ -1354 +1356 @@
                 getChildCount : function()
                 {
                         return this.$.childNodes.length;
-                },
-
+                }
         });