Ticket #6103: 6103.patch

_source/plugins/styles/plugin.js

@@ -110 +110 @@
 
         CKEDITOR.style.prototype =
         {
-                apply : function( document )
+                apply : function( document, config )
                 {
-                        applyStyle.call( this, document, false );
+                        applyStyle.call( this, document, false, config );
                 },
 
-                remove : function( document )
+                remove : function( document, config )
                 {
-                        applyStyle.call( this, document, true );
+                        applyStyle.call( this, document, true, config );
                 },
 
                 applyToRange : function( range )
@@ -1316 +1316 @@
                 return true;
         }
 
-        function applyStyle( document, remove )
+        function applyStyle( document, remove, config )
         {
                 var selection = document.getSelection(),
                         // Bookmark the range so we can re-select it after processing.
                         bookmarks = selection.createBookmarks(),
-                        ranges = selection.getRanges( true ),
+                        ranges = selection.getRanges( config.disableReadonlyStyling || this.type != CKEDITOR.STYLE_INLINE ),
                         func = remove ? this.removeFromRange : this.applyToRange,
-                        range;
+                        range, node;
 
+                // Search for cke_nostyle elements and not fully selected readonly elements.
+                if ( !config.disableReadonlyStyling && this.type == CKEDITOR.STYLE_INLINE )
+                {
+                        for ( var i = 0; i < ranges.length; i++ )
+                        {
+                                range = ranges[ i ];
+
+                                var startContainer = range.startContainer,
+                                        endContainer = range.endContainer,
+                                        walkerRange = range.clone();
+
+                                // Use only fully selected readonly elements.
+                                var readOnly;
+                                if ( ( readOnly = startContainer.isReadOnly() ) )
+                                {
+                                        node = startContainer;
+
+                                        while ( readOnly.$ != parent.$ )
+                                        {
+                                                if ( node.getPrevious() )
+                                                {
+                                                        range.setStartAfter( readOnly );
+                                                        break;
+                                                }
+                                                node = node.getParent();
+                                        }
+                                }
+
+                                if ( ( readOnly = endContainer.isReadOnly() ) )
+                                {
+                                        node = endContainer;
+
+                                        while ( readOnly.$ != parent.$ )
+                                        {
+                                                if ( node.getNext() )
+                                                {
+                                                        range.setStartBefore( readOnly );
+                                                        break;
+                                                }
+                                                node = node.getParent();
+                                        }
+                                }
+
+                                if ( range.collapsed )
+                                        continue;
+
+                                // Looking for non-stylable element inside the range.
+                                var walker = new CKEDITOR.dom.walker( walkerRange );
+                                walker.evaluator = function( node )
+                                {
+                                        if ( node.type == CKEDITOR.NODE_ELEMENT
+                                                && node.hasAttribute( 'cke_nostyle' ) )
+                                        {
+                                                var newRange = range.clone();
+                                                range.setEndBefore( node );
+
+                                                // Drop collapsed range around read-only elements,
+                                                // it make sure the range list empty when selecting
+                                                // only non-editable elements.
+                                                if ( range.collapsed )
+                                                        ranges.splice( i--, 1 );
+
+                                                // Avoid creating invalid range.
+                                                if ( !( node.getPosition( walkerRange.endContainer ) & CKEDITOR.POSITION_CONTAINS ) )
+                                                {
+                                                        newRange.setStartAfter( node );
+                                                        if ( !newRange.collapsed )
+                                                                ranges.splice( i + 1, 0, newRange );
+                                                }
+
+                                                return true;
+                                        }
+
+                                        return false;
+                                };
+
+                                walker.next();
+                        }
+                }
+
                 var iterator = ranges.createIterator();
                 while ( ( range = iterator.getNextRange() ) )
                         func.call( this, range );
@@ -1353 +1433 @@
         if ( doc )
         {
                 if ( this.state == CKEDITOR.TRISTATE_OFF )
-                        this.style.apply( doc );
+                        this.style.apply( doc, editor.config );
                 else if ( this.state == CKEDITOR.TRISTATE_ON )
-                        this.style.remove( doc );
+                        this.style.remove( doc, editor.config );
         }
 
         return !!doc;
@@ -1415 +1495 @@
 };
 
 /**
+ * Disables styling of read only inline elements.
+ * @type Boolean
+ * @default false
+ * @example
+ * config.disableReadonlyStyling = true;
+ */
+CKEDITOR.config.disableReadonlyStyling = false;
+
+/**
  * The "styles definition set" to use in the editor. They will be used in the
  * styles combo and the Style selector of the div container. <br>
  * The styles may be defined in the page containing the editor, or can be