Changeset 7269

Timestamp:

09/08/11 07:42:37 (21 months ago)

Author:

garry.yao

Message:

Post-fixing #8342, reverted [7267].

Location:

CKEditor/trunk/_source/plugins

Files:

• clipboard/plugin.js (modified) (1 diff)
• wysiwygarea/plugin.js (modified) (1 diff)

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

@@ -296 +296 @@
                 if ( this.mode != 'wysiwyg' )
                         return;
-
-                inReadOnly = inReadOnly || this.readOnly;
 
                 this.getCommand( 'cut' ).setState( inReadOnly ? CKEDITOR.TRISTATE_DISABLED : stateFromNamedCommand( 'Cut', this ) );

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

@@ -1105 +1105 @@
                                         editor.on( 'selectionChange', function( evt )
                                         {
+                                                if ( editor.readOnly )
+                                                        return;
+
                                                 var sel = editor.getSelection();
                                                 // Do it only when selection is not locked. (#8222)