Ticket #3100: 3100_2.patch

_source/core/dom/element.js

@@ -658 +658 @@
                         return false;
                 },
 
+                isEditable : function()
+                {
+                        // Get the element name.
+                        var name = this.getName();
+
+                        // Get the element DTD (defaults to span for unknown elements).
+                        var dtd = !CKEDITOR.dtd.$nonEditable[ name ]
+                                                && ( CKEDITOR.dtd[ name ] || CKEDITOR.dtd.span );
+
+                        // In the DTD # == text node.
+                        return ( dtd && dtd['#'] );
+                },
+
                 isIdentical : function( otherElement )
                 {
                         if ( this.getName() != otherElement.getName() )

_source/core/dom/range.js

@@ -1418 +1418 @@
                         walker.forward( CKEDITOR.dom.domWalker.blockBoundary() );
 
                         return !walker.checkFailed;
+                },
+
+                /**
+                 * Moves the range boundaries to the first editing point inside an
+                 * 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.
+                 */
+                moveToElementEditStart : function( targetElement )
+                {
+                        var editableElement;
+
+                        while ( targetElement && targetElement.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();
+                        }
+
+                        if ( editableElement )
+                                this.moveToPosition( editableElement, CKEDITOR.POSITION_AFTER_START );
                 }
         };
 })();

_source/core/dtd.js

@@ -79 +79 @@
                 $listItem : {dd:1,dt:1,li:1},
 
                 /**
+                 * Elements that accept text nodes, but are not possible to edit into
+                 * the browser.
+                 * @type Object
+                 * @example
+                 */
+                $nonEditable : {applet:1,button:1,embed:1,iframe:1,map:1,object:1,option:1,script:1,textarea:1},
+
+                /**
                  * List of elements that can be ignored if empty, like "b" or "span".
                  * @type Object
                  * @example

_source/plugins/wysiwygarea/plugin.js

@@ -32 +32 @@
                 if ( this.mode == 'wysiwyg' )
                 {
                         var element = evt.data,
-                                isBlock = CKEDITOR.dtd.$block[ element.getName() ];
+                                elementName = element.getName(),
+                                isBlock = CKEDITOR.dtd.$block[ elementName ];
 
                         var selection = this.getSelection(),
                                 ranges = selection.getRanges();
@@ -48 +49 @@
 
                                 clone = element.clone( true );
 
+                                var toSplit;
+
                                 // If the new node is a block element, split the current block (if any).
                                 if ( this.config.enterMode != 'br' && isBlock )
                                 {
-                                        var startPath = new CKEDITOR.dom.elementPath( range.startContainer );
-                                        if ( startPath.block )
-                                                range.splitBlock();
+                                        var startPath = new CKEDITOR.dom.elementPath( range.startContainer ),
+                                                j = 0,
+                                                parent;
+
+                                        while( ( parent = startPath.elements[ j++ ] ) && parent != startPath.blockLimit )
+                                        {
+                                                var parentName = parent.getName(),
+                                                        parentDtd = CKEDITOR.dtd[ parentName ];
+
+                                                if ( parentDtd && !parentDtd[ elementName ] )
+                                                        toSplit = parent;
+                                        }
                                 }
 
                                 // Insert the new node.
                                 range.insertNode( clone );
 
+                                if ( toSplit )
+                                        clone.breakParent( toSplit );
+
                                 // Save the last element reference so we can make the
                                 // selection later.
                                 if ( !lastElement )
@@ -66 +81 @@
                         }
 
                         range.moveToPosition( lastElement, CKEDITOR.POSITION_AFTER_END );
+
+                        var next = lastElement.getNextSourceNode( true );
+                        if ( next && next.type == CKEDITOR.NODE_ELEMENT )
+                                range.moveToElementEditStart( next );
+
                         selection.selectRanges( [ range ] );
                 }
         }