Ticket #6869: 6869_2.patch

CHANGES.html

@@ -39 +39 @@
         <p>
                         New features:</p>
         <ul>
-                <li></li>
+                <a href="http://dev.ckeditor.com/ticket/6869">#6869</a> : The "data-cke-nostyle" attribute (which was introduced for escaping element from been touched by the style system since 3.5)
+                is deprecated in favor of  the new one <strong>"data-nostyle"</strong>.</li>
         </ul>
         <p>
                         Fixed issues:</p>

_source/plugins/styles/plugin.js

@@ -367 +367 @@
 
         // Gets the parent element which blocks the styling for an element. This
         // can be done through read-only elements (contenteditable=false) or
-        // elements with the "data-cke-nostyle" attribute.
+        // elements with the "data-nostyle" attribute.
         function getUnstylableParent( element )
         {
                 var unstylable,
@@ -378 +378 @@
                         if ( element.getName() == 'body' )
                                 break;
 
-                        if ( element.getAttribute( 'data-cke-nostyle' ) )
+                        if ( element.getAttribute( 'data-nostyle' ) )
                                 unstylable = element;
                         else if ( !editable )
                         {
@@ -473 +473 @@
                                 var nodeType = currentNode.type;
                                 var nodeName = nodeType == CKEDITOR.NODE_ELEMENT ? currentNode.getName() : null;
                                 var nodeIsReadonly = nodeName && ( currentNode.getAttribute( 'contentEditable' ) == 'false' );
-                                var nodeIsNoStyle = nodeName && currentNode.getAttribute( 'data-cke-nostyle' );
+                                var nodeIsNoStyle = nodeName && currentNode.getAttribute( 'data-nostyle' );
 
                                 if ( nodeName && currentNode.data( 'cke-bookmark' ) )
                                 {

_source/plugins/colorbutton/plugin.js

@@ -220 +220 @@
 
                 function isUnstylable( ele )
                 {
-                        return ( ele.getAttribute( 'contentEditable' ) == 'false' ) || ele.getAttribute( 'data-cke-nostyle' );
+                        return ( ele.getAttribute( 'contentEditable' ) == 'false' ) || ele.getAttribute( 'data-nostyle' );
                 }
         }
 });