Ticket #6735: 6735.patch

_source/core/dom/node.js

@@ -684 +684 @@
                         {
                                 if ( current.type == CKEDITOR.NODE_ELEMENT )
                                 {
-                                        if ( current.is( 'body' ) || current.getCustomData( '_cke_notReadOnly' ) )
-                                                break;
-
-                                        if ( current.getAttribute( 'contentEditable' ) == 'false' )
+                                        if ( current.getAttribute( 'contentEditable' ) == 'false' && !current.getCustomData( '_cke_notReadOnly' ) )
                                                 return current;
-                                        else if ( current.getAttribute( 'contentEditable' ) == 'true' )
+                                        else if ( current.is( 'body' ) || current.getAttribute( 'contentEditable' ) == 'true' )
                                                 break;
                                 }
                                 current = current.getParent();

_source/plugins/selection/plugin.js

@@ -1222 +1222 @@
                         // range position and scroll relatively to it.
                         var start = this.getStartElement();
                         start.scrollIntoView();
+                },
+
+                /**
+                 * Check if current selection is read only with respect to contenteditable="false" blocks
+                 */
+                checkIsReadOnly : function()
+                {
+                        var ranges = this.getRanges(),
+                                startNode = ranges[0].startContainer,
+                                endNode = ranges[ ranges.length - 1 ].endContainer,
+                                commonAncestor = startNode.getCommonAncestor( endNode ),
+                                currentNode = startNode;
+                        if ( endNode === startNode )
+                                endNode = 0;
+                        do {
+                                if ( currentNode.isReadOnly() )
+                                        return true;
+                        } while ( currentNode!==commonAncestor && ( currentNode = currentNode.getParent() ) || ( currentNode = endNode ) && !( endNode = 0 ) );
+                        return false;
                 }
         };
 })();

_source/plugins/wysiwygarea/plugin.js

@@ -1 @@
-/*
+/*
 Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
@@ -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' )
@@ -40 +32 @@
                         this.focus();
 
                         var selection = this.getSelection();
-                        if ( checkReadOnly( selection ) )
+                        if ( selection.checkIsReadOnly() )
                                 return;
 
                         var data = evt.data;
@@ -116 +108 @@
                         this.focus();
 
                         var selection = this.getSelection();
-                        if ( checkReadOnly( selection ) )
+                        if ( selection.checkIsReadOnly() )
                                 return;
 
                         this.fire( 'saveSnapshot' );