Ticket #8246: 8246_3.patch

_source/core/dom/node.js

@@ -654 +654 @@
                 },
 
                 /**
-                 * Checks if this node is read-only (should not be changed). Additionally
-                 * it returns the element that defines the read-only state of this node
-                 * (if present). It may be the node itself or any of its parent
-                 * nodes.
-                 * @returns {CKEDITOR.dom.element|Boolean} An element containing
-                 *              read-only attributes or "false" if none is found.
+                 * Checks if this node is read-only (should not be changed).
+                 * @returns {Boolean}
                  * @since 3.5
                  * @example
                  * // For the following HTML:
                  * // <div contenteditable="false">Some <b>text</b></div>
                  *
                  * // If "ele" is the above <div>
-                 * ele.isReadOnly();  // the <div> element
-                 *
-                 * // If "ele" is the above <b>
-                 * ele.isReadOnly();  // the <div> element
+                 * ele.isReadOnly();  // true
                  */
                 isReadOnly : function()
                 {
-                        var current = this;
-                        while( current )
-                        {
-                                if ( current.type == CKEDITOR.NODE_ELEMENT )
-                                {
-                                        if ( current.is( 'body' ) || !!current.data( 'cke-editable' ) )
-                                                break;
+                        var element = this;
+                        if ( this.type != CKEDITOR.NODE_ELEMENT )
+                                element = this.getParent();
 
-                                        if ( current.getAttribute( 'contentEditable' ) == 'false' )
-                                                return current;
-                                        else if ( current.getAttribute( 'contentEditable' ) == 'true' )
-                                                break;
-                                }
-                                current = current.getParent();
-                        }
-
-                        return false;
+                        if ( element
+                                        && typeof element.$.isContentEditable != 'undefined'
+                                        && !element.data( 'cke-editable' ) )
+                        {
+                                return !element.$.isContentEditable;
+                        }
+                        else
+                                return false;
                 }
         }
 );

_source/plugins/wysiwygarea/plugin.js

@@ -1240 +1240 @@
                                 {
                                         // We should flag that the element was locked by our code so
                                         // it'll be editable by the editor functions (#6046).
-                                        if ( !element.isReadOnly() )
+                                        var readonly = element.getAttribute( 'contenteditable' ) == 'false';
+                                        if ( !readonly )
+                                        {
                                                 element.data( 'cke-editable', element.hasAttribute( 'contenteditable' ) ? 'true' : '1' );
-                                        element.setAttribute( 'contentEditable', false );
-                                }
+                                                element.setAttribute( 'contenteditable', false );
+                                        }
+                                }
                         });
 
                 }

_source/plugins/selection/plugin.js

@@ -961 +961 @@
                                                 if ( range.collapsed )
                                                         continue;
 
+                                                // Range may start inside a non-editable element,
+                                                // replace the range start after it.
+                                                if ( range.startContainer.isReadOnly() )
+                                                {
+                                                        var current = range.startContainer;
+                                                        while( current )
+                                                        {
+                                                                if ( current.is( 'body' ) || !current.isReadOnly() )
+                                                                        break;
+
+                                                                if ( current.type == CKEDITOR.NODE_ELEMENT
+                                                                                && current.getAttribute( 'contentEditable' ) == 'false' )
+                                                                        range.setStartAfter( current );
+
+                                                                current = current.getParent();
+                                                        }
+                                                }
+
                                                 var startContainer = range.startContainer,
                                                         endContainer = range.endContainer,
                                                         startOffset = range.startOffset,
                                                         endOffset = range.endOffset,
                                                         walkerRange = range.clone();
 
-                                                // Range may start inside a non-editable element, restart range
-                                                // by the end of it.
-                                                var readOnly;
-                                                if ( ( readOnly = startContainer.isReadOnly() ) )
-                                                        range.setStartAfter( readOnly );
-
                                                 // Enlarge range start/end with text node to avoid walker
                                                 // being DOM destructive, it doesn't interfere our checking
                                                 // of elements below as well.