Got questions, comments, patches, etc.?
Contact Jason Woofenden
gitweb
/
ckeditor.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vanilla ckeditor-3.6.5
[ckeditor.git]
/
_source
/
plugins
/
blockquote
/
plugin.js
diff --git
a/_source/plugins/blockquote/plugin.js
b/_source/plugins/blockquote/plugin.js
index
128e267
..
f17aec2
100644
(file)
--- a/
_source/plugins/blockquote/plugin.js
+++ b/
_source/plugins/blockquote/plugin.js
@@
-1,5
+1,5
@@
/*
\r
/*
\r
-Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved.
\r
+Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
\r
For licensing, see LICENSE.html or http://ckeditor.com/license
\r
*/
\r
\r
For licensing, see LICENSE.html or http://ckeditor.com/license
\r
*/
\r
\r
@@
-25,8
+25,11
@@
For licensing, see LICENSE.html or http://ckeditor.com/license
\r
function onSelectionChange( evt )
\r
{
\r
\r
function onSelectionChange( evt )
\r
{
\r
- var editor = evt.editor,
\r
- command = editor.getCommand( 'blockquote' );
\r
+ var editor = evt.editor;
\r
+ if ( editor.readOnly )
\r
+ return;
\r
+
\r
+ var command = editor.getCommand( 'blockquote' );
\r
command.state = getState( editor, evt.data.path );
\r
command.fire( 'state' );
\r
}
\r
command.state = getState( editor, evt.data.path );
\r
command.fire( 'state' );
\r
}
\r
@@
-95,6
+98,7
@@
For licensing, see LICENSE.html or http://ckeditor.com/license
\r
var iterator = range.createIterator(),
\r
block;
\r
\r
var iterator = range.createIterator(),
\r
block;
\r
+ iterator.enlargeBr = editor.config.enterMode != CKEDITOR.ENTER_BR;
\r
\r
if ( state == CKEDITOR.TRISTATE_OFF )
\r
{
\r
\r
if ( state == CKEDITOR.TRISTATE_OFF )
\r
{
\r