Ticket #5479: 5479_10.patch

_source/core/dom/element.js

@@ -234 +234 @@
                                 this.append( new CKEDITOR.dom.text( text ) );
                 },
 
-                appendBogus : function()
-                {
-                        var lastChild = this.getLast() ;
-
-                        // Ignore empty/spaces text.
-                        while ( lastChild && lastChild.type == CKEDITOR.NODE_TEXT && !CKEDITOR.tools.rtrim( lastChild.getText() ) )
-                                lastChild = lastChild.getPrevious();
-                        if ( !lastChild || !lastChild.is || !lastChild.is( 'br' ) )
-                        {
-                                var bogus = CKEDITOR.env.opera ?
-                                                this.getDocument().createText('') :
-                                                this.getDocument().createElement( 'br' );
-
-                                CKEDITOR.env.gecko && bogus.setAttribute( 'type', '_moz' );
-
-                                this.append( bogus );
-                        }
-                },
-
                 /**
                 * Retrieve block element's filler node if existed.
                 */

_source/core/dom/walker.js

@@ -449 +449 @@
                 return false;
         };
 
+        // Append a filler node at the end of an element if not exists.
+        CKEDITOR.dom.element.prototype.appendBogus = function()
+        {
+                var lastChild = this.getLast( fillerEvaluator ) ;
+                if ( !lastChild || !lastChild.is || !lastChild.is( 'br' ) )
+                {
+                        var bogus = CKEDITOR.env.opera ?
+                                        this.getDocument().createText('') :
+                                        this.getDocument().createElement( 'br' );
+
+                        CKEDITOR.env.gecko && bogus.setAttribute( 'type', '_moz' );
+
+                        this.append( bogus );
+                }
+        };
+
+
 })();

_source/plugins/wysiwygarea/plugin.js

@@ -304 +304 @@
                 return block.getOuterHtml().match( emptyParagraphRegexp );
         }
 
-        isNotWhitespace = CKEDITOR.dom.walker.whitespaces( true );
-
         // Gecko need a key event to 'wake up' the editing
         // ability when document is empty.(#3864, #5781)
         function activateEditing( editor )
@@ -359 +357 @@
 
                 CKEDITOR.env.gecko && activateEditing( editor );
 
+                // Remove the padding body node used in IE.
+                if ( CKEDITOR.env.ie )
+                {
+                        var start = range.collapsed && range.startContainer;
+                        if ( start.type == CKEDITOR.NODE_ELEMENT && start.is( 'span') && start.data( 'cke-bogus') )
+                        {
+                                range.moveToPosition( start, CKEDITOR.POSITION_BEFORE_START );
+                                start.remove();
+                                range.select();
+                                return;
+                        }
+                }
+
                 // When enterMode set to block, we'll establing new paragraph only if we're
                 // selecting inline contents right under body. (#3657)
                 if ( enterMode != CKEDITOR.ENTER_BR
@@ -396 +407 @@
                                 {
                                         element = fixedBlock.getPrevious( isNotWhitespace );
                                         if ( element &&
-                                                 element.type == CKEDITOR.NODE_ELEMENT &&
-                                                 !nonExitable( element ) )
+                                                 element.type == CKEDITOR.NODE_ELEMENT )
                                         {
-                                                range.moveToElementEditEnd( element );
-                                                fixedBlock.remove();
-                                        }
-                                }
-                        }
+                                                if ( !nonExitable( element ) )
+                                                {
+                                                        range.moveToElementEditEnd( element );
+                                                        fixedBlock.remove();
+                                                }
+                                                else if ( element.getDirection() )
+                                                        fixedBlock.setAttribute( 'dir', element.getDirection() );
+                                        }
+                                }
+                        }
 
                         range.select();
                         // Notify non-IE that selection has changed.
@@ -423 +438 @@
                 walkerRange.selectNodeContents( body );
                 walker.evaluator = function( node )
                 {
-                        return node.type == CKEDITOR.NODE_ELEMENT && ( node.getName() in nonExitableElementNames );
+                        return node.type == CKEDITOR.NODE_ELEMENT && nonExitable( node );
                 };
                 walker.guard = function( node, isMoveout )
                 {
@@ -444 +459 @@
 
                         if ( !CKEDITOR.env.ie )
                                 paddingBlock.appendBogus();
-                }
-        }
+                        else if ( paddingBlock.is( 'body' ) )
+                        {
+                                // IE need at least a node to show the cursor, use a zero height br
+                                // to fly under the radar, additionally wrap the br element with an extra span ,
+                                // so selection change event could be easily captured when cursor move inside of it.
+                                var paddingNode = CKEDITOR.dom.element.createFromHtml( '<span data-cke-bogus=1>' +
+                                        '<br data-cke-temp=1 style="line-height:0"/></span>', editor.document );
+                                paddingBlock.append( paddingNode );
+                        }
+                }
+        }
 
         CKEDITOR.plugins.add( 'wysiwygarea',
         {
@@ -1167 +1191 @@
                                 }
                         });
 
-                }
-        });
+                                        }
+                        });
 
         // Fixing Firefox 'Back-Forward Cache' break design mode. (#4514)
         if ( CKEDITOR.env.gecko )