Ticket #7216: 7216.patch

_source/core/dom/node.js

@@ -648 +648 @@
                         }
                 },
 
-                /**
-                 * Checks is this node is read-only (should not be changed). It
-                 * additionaly returns the element, if any, which defines the read-only
-                 * state of this node. 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.
-                 * @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
-                 */
                 isReadOnly : function()
                 {
-                        var current = this;
-                        while( current )
-                        {
-                                if ( current.type == CKEDITOR.NODE_ELEMENT )
-                                {
-                                        if ( current.is( 'body' ) || !!current.data( 'cke-editable' ) )
-                                                break;
-
-                                        if ( current.getAttribute( 'contentEditable' ) == 'false' )
-                                                return current;
-                                        else if ( current.getAttribute( 'contentEditable' ) == 'true' )
-                                                break;
-                                }
-                                current = current.getParent();
-                        }
-
+                        // The full implementation is in the "noneditable" plugin
                         return false;
                 }
         }

_source/plugins/noneditable/plugin.js

@@ +1 @@
+/*
+Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+/**
+ * @fileOverview The "non-Editable" plugin. Adds additional styles, functions
+ * and event handlers to provide correct support for contentEditable=false
+ * elements.
+ */
+
+CKEDITOR.plugins.add( 'noneditable',
+{
+        init : function( editor )
+        {
+
+                // IE>=8 stricts mode doesn't have 'contentEditable' in effect
+                // on element unless it has layout. (#5562)
+                if ( CKEDITOR.document.$.documentMode >= 8 )
+                {
+                        editor.addCss( 'html.CSS1Compat [contenteditable=false]{ min-height:0 !important;}' );
+
+                        var selectors = [];
+                        for ( var tag in CKEDITOR.dtd.$removeEmpty )
+                                selectors.push( 'html.CSS1Compat ' + tag + '[contenteditable=false]' );
+                        editor.addCss( selectors.join( ',' ) + '{ display:inline-block;}' );
+                }
+
+        }
+});
+
+
+/**
+ * Checks if this node is read-only (should not be changed). It
+ * additionaly returns the element, if any, which defines the read-only
+ * state of this node. It may be the node itself or any of its parent
+ * nodes.
+ * Since 3.x the default implementation is a placeholder, to get the full
+ * functionality the 'noneditable' plugin must be loaded.
+ * @returns {CKEDITOR.dom.element|Boolean} An element containing
+ *              read-only attributes or "false" if none is found.
+ * @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
+ */
+CKEDITOR.dom.node.prototype.isReadOnly = function()
+{
+        var current = this;
+        while( current )
+        {
+                if ( current.type == CKEDITOR.NODE_ELEMENT )
+                {
+                        if ( current.is( 'body' ) || !!current.data( 'cke-editable' ) )
+                                break;
+
+                        if ( current.getAttribute( 'contentEditable' ) == 'false' )
+                                return current;
+                        else if ( current.getAttribute( 'contentEditable' ) == 'true' )
+                                break;
+                }
+                current = current.getParent();
+        }
+
+        return false;
+}
+

_source/plugins/placeholder/plugin.js

@@ -13 +13 @@
         var placeholderReplaceRegex = /\[\[[^\]]+\]\]/g;
         CKEDITOR.plugins.add( 'placeholder',
         {
-                requires : [ 'dialog' ],
+                requires : [ 'dialog', 'noneditable' ],
                 lang : [ 'en' ],
                 init : function( editor )
                 {

_source/plugins/wysiwygarea/plugin.js

@@ -1109 +1109 @@
                                         editor.document.$.title = frameLabel;
                                 });
 
-                        // IE>=8 stricts mode doesn't have 'contentEditable' in effect
-                        // on element unless it has layout. (#5562)
-                        if ( CKEDITOR.document.$.documentMode >= 8 )
-                        {
-                                editor.addCss( 'html.CSS1Compat [contenteditable=false]{ min-height:0 !important;}' );
-
-                                var selectors = [];
-                                for ( var tag in CKEDITOR.dtd.$removeEmpty )
-                                        selectors.push( 'html.CSS1Compat ' + tag + '[contenteditable=false]' );
-                                editor.addCss( selectors.join( ',' ) + '{ display:inline-block;}' );
-                        }
                         // Set the HTML style to 100% to have the text cursor in affect (#6341)
-                        else if ( CKEDITOR.env.gecko )
+                        if ( CKEDITOR.env.gecko )
                                 editor.addCss( 'html { height: 100% !important; }' );
 
                         // Switch on design mode for a short while and close it after then.