Ticket #4781: 4781_5.patch

_source/core/dom/range.js

@@ -1599 +1599 @@
                  * element. For example, in an element tree like
                  * "<p><b><i></i></b> Text</p>", the start editing point is
                  * "<p><b><i>^</i></b> Text</p>" (inside <i>).
-                 * @param {CKEDITOR.dom.element} targetElement The element into which
-                 *              look for the editing spot.
+                 * @param {CKEDITOR.dom.element} el The element into which look for the
+                 *              editing spot.
                  */
-                moveToElementEditStart : function( targetElement )
+                moveToElementEditStart : function( el )
                 {
-                        var editableElement;
+                        var isEditable;
 
-                        while ( targetElement && targetElement.type == CKEDITOR.NODE_ELEMENT )
+                        var whitespaceEval = new CKEDITOR.dom.walker.whitespaces(),
+                                bookmarkEval = new CKEDITOR.dom.walker.bookmark();
+                        
+                        var evaluator = function( node )
+                                {
+                                        // Whitespaces and bookmark nodes are to be ignored.
+                                        return ( !whitespaceEval( node ) && !bookmarkEval( node ) );
+                                };
+
+                        while ( el && el.type == CKEDITOR.NODE_ELEMENT )
                         {
-                                if ( targetElement.isEditable() )
-                                        editableElement = targetElement;
-                                else if ( editableElement )
-                                        break ;         // If we already found an editable element, stop the loop.
-
-                                targetElement = targetElement.getFirst();
+                                isEditable = el.isEditable();
+                                
+                                // If an editable element is found, move inside it.
+                                if ( isEditable )
+                                        this.moveToPosition( el, CKEDITOR.POSITION_AFTER_START );
+                                // Stop immediately if we've found a non editable inline element (e.g <img>).
+                                else if ( CKEDITOR.dtd.$inline[ el.getName() ] )
+                                {
+                                        this.moveToPosition( el, CKEDITOR.POSITION_BEFORE_START );
+                                        return true;
+                                }
+                                
+                                // Non-editable non-inline elements are to be bypassed, getting the next one.
+                                if ( CKEDITOR.dtd.$empty[ el.getName() ] )
+                                        el = el.getNext( evaluator ); 
+                                else
+                                        el = el.getFirst( evaluator ); 
+                                
+                                // Stop immediately if we've found a text node.
+                                if ( el && el.type == CKEDITOR.NODE_TEXT )
+                                {
+                                        this.moveToPosition( el, CKEDITOR.POSITION_BEFORE_START );
+                                        return true;
+                                }
                         }
 
-                        if ( editableElement )
-                        {
-                                this.moveToPosition(editableElement, CKEDITOR.POSITION_AFTER_START);
-                                return true;
-                        }
-                        else
-                                return false;
+                        return isEditable;
                 },
 
                 /**

_source/core/dom/walker.js

@@ -47 +47 @@
                         {
                                 return ( ( !movingOut || !limitLTR.equals( node ) )
                                         && ( !blockerLTR || !node.equals( blockerLTR ) )
-                                        && ( node.type != CKEDITOR.NODE_ELEMENT || node.getName() != 'body' ) );
+                                        && ( node.type != CKEDITOR.NODE_ELEMENT || !movingOut || node.getName() != 'body' ) );
                         };
                 }
 
@@ -62 +62 @@
                         {
                                 return ( ( !movingOut || !limitRTL.equals( node ) )
                                         && ( !blockerRTL || !node.equals( blockerRTL ) )
-                                        && ( node.type != CKEDITOR.NODE_ELEMENT || node.getName() != 'body' ) );
+                                        && ( node.type != CKEDITOR.NODE_ELEMENT || !movingOut || node.getName() != 'body' ) );
                         };
                 }
 
@@ -78 +78 @@
                                 if ( stopGuard( node, movingOut ) === false )
                                         return false;
 
-                                return userGuard( node );
+                                return userGuard( node, movingOut );
                         };
                 }
                 else
@@ -396 +396 @@
         };
 
         /**
-         * Whether the node contains only white-spaces characters.
+         * Whether the node is a text node containing only whitespaces characters.
          * @param isReject
          */
         CKEDITOR.dom.walker.whitespaces = function( isReject )

_source/core/dtd.js

@@ -66 +66 @@
                  */
                 $block : block,
 
+                $inline : L,    // Just like span.
+
                 $body : X({script:1}, block),
 
                 $cdata : {script:1,style:1},