Changeset 6820 for CKEditor/trunk

Timestamp:

04/29/11 17:07:58 (2 years ago)

Author:

garry.yao

Message:

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

File:

• CKEditor/trunk/_source/plugins/styles/plugin.js (modified) (2 diffs)

CKEditor/trunk/_source/plugins/styles/plugin.js

@@ -816 +816 @@
                 var root = range.getCommonAncestor( true, true ),
                         element = root.getAscendant( this.element, true );
-                element && setupElement( element, this );
+                element && !element.isReadOnly() && setupElement( element, this );
         }
 
@@ -873 +873 @@
                 while ( ( block = iterator.getNextParagraph() ) )               // Only one =
                 {
-                        var newBlock = getElement( this, doc, block );
-                        replaceBlock( block, newBlock );
+                        if ( !block.isReadOnly() )
+                        {
+                                var newBlock = getElement( this, doc, block );
+                                replaceBlock( block, newBlock );
+                        }
                 }