Ticket #6646: 6646.patch

_source/plugins/htmldataprocessor/plugin.js

@@ -250 +250 @@
 
         function protectReadOnly( element )
         {
-                element.attributes.contenteditable = "false";
+                var attrs = element.attributes;
+                // We should flag that the element was locked by our code so
+                // it'll be editable by the editor functions (#6046).
+                if ( attrs.contenteditable != "false" )
+                        attrs[ '_cke_editable' ] = attrs.contenteditable? true : 1;
+
+                attrs.contenteditable = "false";
         }
+
         function unprotectReadyOnly( element )
         {
-                delete element.attributes.contenteditable;
-        }
+                var attrs = element.attributes;
+                switch( attrs[ '_cke_editable' ] )
+                {
+                        case 'true' : attrs.contenteditable = true; break;
+                        case '1' :      delete attrs.contenteditable;
+                }
+
+                delete attrs[ '_cke_editable' ];
+        }
         // Disable form elements editing mode provided by some browers. (#5746)
         for ( i in { input : 1, textarea : 1 } )
         {

_source/core/dom/node.js

@@ -666 +666 @@
                         {
                                 if ( current.type == CKEDITOR.NODE_ELEMENT )
                                 {
-                                        if ( current.is( 'body' ) || current.getCustomData( '_cke_notReadOnly' ) )
+                                        if ( current.is( 'body' ) || current.getAttribute( '_cke_editable' ) )
                                                 break;
 
                                         if ( current.getAttribute( 'contentEditable' ) == 'false' )

_source/plugins/wysiwygarea/plugin.js

@@ -1047 +1047 @@
                                 if ( element.type == CKEDITOR.NODE_ELEMENT
                                                 && ( element.is( 'input' ) || element.is( 'textarea' ) ) )
                                 {
-                                        if ( !element.isReadOnly() )
-                                        {
-                                                element.setAttribute( 'contentEditable', false );
-                                                // We should flag that the element was locked by our code so
-                                                // it'll be editable by the editor functions (#6046).
-                                                element.setCustomData( '_cke_notReadOnly', 1 );
-                                        }
-                                }
+                                        // We should flag that the element was locked by our code so
+                                        // it'll be editable by the editor functions (#6046).
+                                        if ( !element.isReadOnly() )
+                                                element.setAttribute( '_cke_editable',
+                                                        element.hasAttribute( 'contenteditable' ) ? true : 1  );
+
+                                        element.setAttribute( 'contentEditable', false );
+                                }
                         });
 
                 }