Ticket #6735: 6375_3.patch

_source/plugins/wysiwygarea/plugin.js

@@ -25 +25 @@
                                 || element.isBlockBoundary() && CKEDITOR.dtd.$empty[ element.getName() ];
         }
 
-        function checkReadOnly( selection )
-        {
-                if ( selection.getType() == CKEDITOR.SELECTION_ELEMENT )
-                        return selection.getSelectedElement().isReadOnly();
-                else
-                        return selection.getCommonAncestor().isReadOnly();
-        }
-
         function onInsertHtml( evt )
         {
                 if ( this.mode == 'wysiwyg' )
                 {
                         this.focus();
 
-                        var selection = this.getSelection();
-                        if ( checkReadOnly( selection ) )
+                        // HTML insertion only considers the first range.
+                        var selection = this.getSelection(),
+                                range = selection.getRanges()[ 0 ];
+
+                        if ( range.checkReadOnly() )
                                 return;
 
                         var data = evt.data;
@@ -67 +62 @@
                                         // (#6005), we need to make some checks and eventually
                                         // delete the selection first.
 
-                                        var range = selection.getRanges()[0],
+                                        range = selection.getRanges()[0],
                                                 endContainer = range && range.endContainer;
 
                                         if ( endContainer &&
@@ -116 +111 @@
                         this.focus();
 
                         var selection = this.getSelection();
-                        if ( checkReadOnly( selection ) )
-                                return;
 
                         this.fire( 'saveSnapshot' );
 
@@ -137 +130 @@
                         {
                                 range = ranges[ i ];
 
-                                // Remove the original contents.
-                                range.deleteContents();
+                                if ( !range.checkReadOnly() )
+                                {
+                                        // Remove the original contents.
+                                        range.deleteContents();
 
-                                clone = !i && element || element.clone( 1 );
+                                        clone = !i && element || element.clone( 1 );
 
-                                // If we're inserting a block at dtd-violated position, split
-                                // the parent blocks until we reach blockLimit.
-                                var current, dtd;
-                                if ( isBlock )
-                                {
-                                        while ( ( current = range.getCommonAncestor( 0, 1 ) )
-                                                        && ( dtd = CKEDITOR.dtd[ current.getName() ] )
-                                                        && !( dtd && dtd [ elementName ] ) )
-                                        {
-                                                // Split up inline elements.
-                                                if ( current.getName() in CKEDITOR.dtd.span )
-                                                        range.splitElement( current );
-                                                // If we're in an empty block which indicate a new paragraph,
-                                                // simply replace it with the inserting block.(#3664)
-                                                else if ( range.checkStartOfBlock()
-                                                         && range.checkEndOfBlock() )
-                                                {
-                                                        range.setStartBefore( current );
-                                                        range.collapse( true );
-                                                        current.remove();
-                                                }
-                                                else
-                                                        range.splitBlock();
-                                        }
-                                }
+                                        // If we're inserting a block at dtd-violated position, split
+                                        // the parent blocks until we reach blockLimit.
+                                        var current, dtd;
+                                        if ( isBlock )
+                                        {
+                                                while ( ( current = range.getCommonAncestor( 0, 1 ) )
+                                                                && ( dtd = CKEDITOR.dtd[ current.getName() ] )
+                                                                && !( dtd && dtd [ elementName ] ) )
+                                                {
+                                                        // Split up inline elements.
+                                                        if ( current.getName() in CKEDITOR.dtd.span )
+                                                                range.splitElement( current );
+                                                        // If we're in an empty block which indicate a new paragraph,
+                                                        // simply replace it with the inserting block.(#3664)
+                                                        else if ( range.checkStartOfBlock()
+                                                                        && range.checkEndOfBlock() )
+                                                        {
+                                                                range.setStartBefore( current );
+                                                                range.collapse( true );
+                                                                current.remove();
+                                                        }
+                                                        else
+                                                                range.splitBlock();
+                                                }
+                                        }
 
-                                // Insert the new node.
-                                range.insertNode( clone );
+                                        // Insert the new node.
+                                        range.insertNode( clone );
+                                        i && ranges.pop();
 
-                                // Save the last element reference so we can make the
-                                // selection later.
-                                if ( !lastElement )
-                                        lastElement = clone;
-                        }
+                                        // Save the last element reference so we can make the
+                                        // selection later.
+                                        if ( !lastElement )
+                                                lastElement = clone;
+                                }
+                        }
 
-                        range.moveToPosition( lastElement, CKEDITOR.POSITION_AFTER_END );
+                        if ( lastElement )
+                        {
+                                range.moveToPosition( lastElement, CKEDITOR.POSITION_AFTER_END );
 
-                        // If we're inserting a block element immediatelly followed by
-                        // another block element, the selection must move there. (#3100,#5436)
-                        if ( isBlock )
-                        {
-                                var next = lastElement.getNext( notWhitespaceEval ),
-                                        nextName = next && next.type == CKEDITOR.NODE_ELEMENT && next.getName();
+                                // If we're inserting a block element immediatelly followed by
+                                // another block element, the selection must move there. (#3100,#5436)
+                                if ( isBlock )
+                                {
+                                        var next = lastElement.getNext( notWhitespaceEval ),
+                                                nextName = next && next.type == CKEDITOR.NODE_ELEMENT && next.getName();
 
-                                // Check if it's a block element that accepts text.
-                                if ( nextName && CKEDITOR.dtd.$block[ nextName ] && CKEDITOR.dtd[ nextName ]['#'] )
-                                        range.moveToElementEditStart( next );
-                        }
+                                        // Check if it's a block element that accepts text.
+                                        if ( nextName && CKEDITOR.dtd.$block[ nextName ] && CKEDITOR.dtd[ nextName ]['#'] )
+                                                range.moveToElementEditStart( next );
+                                }
+                        }
 
-                        selection.selectRanges( [ range ] );
+                        selection.selectRanges( ranges );
 
                         if ( selIsLocked )
                                 this.getSelection().lock();

_source/core/dom/range.js

@@ -1745 +1745 @@
                 },
 
                 /**
+                 * Check if elements at which the range boundaries anchor are read-only,
+                 * with respect to "contenteditable" attribute.
+                 */
+                checkReadOnly : ( function()
+                {
+                        function checkPathEditable( node, anotherEnd )
+                        {
+                                while( node )
+                                {
+                                        if ( node.type == CKEDITOR.NODE_ELEMENT )
+                                        {
+                                                if ( node.getAttribute( 'contentEditable' ) == 'false'
+                                                        && !node.getCustomData( '_cke_notReadOnly' ) )
+                                                        return 0;
+                                                else if ( node.is( 'body' )
+                                                        || node.getAttribute( 'contentEditable' ) == 'true'
+                                                                && ( node.contains( anotherEnd ) || node.equals( anotherEnd ) ) )
+                                                {
+                                                        break;
+                                                }
+                                        }
+                                        node = node.getParent();
+                                }
+
+                                return 1;
+                        }
+
+                        return function()
+                        {
+                                var startNode = this.startContainer,
+                                        endNode = this.endContainer;
+
+                                // Check if elements path at both boundaries are editable.
+                                return !( checkPathEditable( startNode, endNode ) && checkPathEditable( endNode, startNode ) )
+                        };
+                })(),
+
+                /**
                  * Moves the range boundaries to the first/end editing point inside an
                  * element. For example, in an element tree like
                  * "<p><b><i></i></b> Text</p>", the start editing point is