X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=_source%2Fplugins%2Fblockquote%2Fplugin.js;h=dc4eb8c68e1ea267b66554f0a02817399e3e566e;hb=refs%2Ftags%2Fv3.6.2;hp=128e2679376dd3c7c08375505b3407dcd05e299c;hpb=e371ddf8abcb89013e20e6d0dd746adec344d0e5;p=ckeditor.git

diff --git a/_source/plugins/blockquote/plugin.js b/_source/plugins/blockquote/plugin.js
index 128e267..dc4eb8c 100644
--- a/_source/plugins/blockquote/plugin.js
+++ b/_source/plugins/blockquote/plugin.js
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
 
@@ -25,8 +25,11 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 
 	function onSelectionChange( evt )
 	{
-		var editor = evt.editor,
-			command = editor.getCommand( 'blockquote' );
+		var editor = evt.editor;
+		if ( editor.readOnly )
+			return;
+
+		var command = editor.getCommand( 'blockquote' );
 		command.state = getState( editor, evt.data.path );
 		command.fire( 'state' );
 	}
@@ -95,6 +98,7 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 
 			var iterator = range.createIterator(),
 				block;
+			iterator.enlargeBr = editor.config.enterMode != CKEDITOR.ENTER_BR;
 
 			if ( state == CKEDITOR.TRISTATE_OFF )
 			{