Ticket #6103: 6103_2.patch
File 6103_2.patch, 2.4 KB (added by , 13 years ago) |
---|
-
_source/plugins/styles/plugin.js
102 102 : 103 103 CKEDITOR.STYLE_INLINE; 104 104 105 // Inline styles must leave read-only elements retained. (#6103) 106 if ( this.type == CKEDITOR.STYLE_INLINE ) 107 { 108 styleDefinition.parentRule = CKEDITOR.tools.override( styleDefinition.parentRule, 109 function( org ) 110 { 111 return function( element ) { return org && org( element ) || !element.isReadOnly(); } 112 }); 113 } 114 105 115 this._ = 106 116 { 107 117 definition : styleDefinition … … 464 474 465 475 } 466 476 } 467 else 468 applyStyle = true; 477 469 478 } 470 479 else 471 480 applyStyle = true; -
_source/plugins/selection/plugin.js
792 792 walkerRange.setEndAfter( endContainer ); 793 793 } 794 794 795 // Looking for non-editable elementinside the range.795 // Looking for non-editable blocks inside the range. 796 796 var walker = new CKEDITOR.dom.walker( walkerRange ); 797 797 walker.evaluator = function( node ) 798 798 { 799 799 if ( node.type == CKEDITOR.NODE_ELEMENT 800 && node.getAttribute( 'contenteditable' ) == 'false' ) 800 && node.getAttribute( 'contenteditable' ) == 'false' 801 && node.isBlockBoundary() ) 801 802 { 802 803 var newRange = range.clone(); 803 804 range.setEndBefore( node ); -
_source/plugins/colorbutton/plugin.js
101 101 102 102 colorStyle.childRule = type == 'back' ? 103 103 // It's better to apply background color as the innermost style. (#3599) 104 function( ){ return false; } :104 function( element ){ return element.isReadOnly(); } : 105 105 // Fore color style must be applied inside links instead of around it. 106 function( element ){ return element. getName() != 'a'; };106 function( element ){ return element.isReadOnly() || element.getName() != 'a'; }; 107 107 108 108 new CKEDITOR.style( colorStyle, { color : color } ).apply( editor.document ); 109 109 }