Changeset 6820 for CKEditor/trunk


Ignore:
Timestamp:
04/29/11 17:07:58 (4 years ago)
Author:
garry.yao
Message:

#7694: Fixing a regression of [6128] which cause styles get applied on read-only blocks.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • CKEditor/trunk/_source/plugins/styles/plugin.js

    r6817 r6820  
    816816                var root = range.getCommonAncestor( true, true ), 
    817817                        element = root.getAscendant( this.element, true ); 
    818                 element && setupElement( element, this ); 
     818                element && !element.isReadOnly() && setupElement( element, this ); 
    819819        } 
    820820 
     
    873873                while ( ( block = iterator.getNextParagraph() ) )               // Only one = 
    874874                { 
    875                         var newBlock = getElement( this, doc, block ); 
    876                         replaceBlock( block, newBlock ); 
     875                        if ( !block.isReadOnly() ) 
     876                        { 
     877                                var newBlock = getElement( this, doc, block ); 
     878                                replaceBlock( block, newBlock ); 
     879                        } 
    877880                } 
    878881 
Note: See TracChangeset for help on using the changeset viewer.
© 2003 – 2012 CKSource – Frederico Knabben. All rights reserved. | Terms of use | Privacy policy