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.6
[ckeditor.git]
/
_source
/
plugins
/
indent
/
plugin.js
diff --git
a/_source/plugins/indent/plugin.js
b/_source/plugins/indent/plugin.js
index
5dcfe63
..
e5db0b2
100644
(file)
--- a/
_source/plugins/indent/plugin.js
+++ b/
_source/plugins/indent/plugin.js
@@
-1,5
+1,5
@@
/*
\r
/*
\r
-Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
\r
+Copyright (c) 2003-2013, 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
@@
-15,6
+15,9
@@
For licensing, see LICENSE.html or http://ckeditor.com/license
\r
function onSelectionChange( evt )
\r
{
\r
\r
function onSelectionChange( evt )
\r
{
\r
+ if ( evt.editor.readOnly )
\r
+ return null;
\r
+
\r
var editor = evt.editor,
\r
elementPath = evt.data.path,
\r
list = elementPath && elementPath.contains( listNodeNames ),
\r
var editor = evt.editor,
\r
elementPath = evt.data.path,
\r
list = elementPath && elementPath.contains( listNodeNames ),
\r
@@
-77,7
+80,7
@@
For licensing, see LICENSE.html or http://ckeditor.com/license
\r
function isListItem( node )
\r
{
\r
\r
function isListItem( node )
\r
{
\r
- return node.type = CKEDITOR.NODE_ELEMENT && node.is( 'li' );
\r
+ return node.type == CKEDITOR.NODE_ELEMENT && node.is( 'li' );
\r
}
\r
\r
indentCommand.prototype = {
\r
}
\r
\r
indentCommand.prototype = {
\r
@@
-139,8
+142,11
@@
For licensing, see LICENSE.html or http://ckeditor.com/license
{
\r
listArray[ i ].indent += indentOffset;
\r
// Make sure the newly created sublist get a brand-new element of the same type. (#5372)
\r
{
\r
listArray[ i ].indent += indentOffset;
\r
// Make sure the newly created sublist get a brand-new element of the same type. (#5372)
\r
- var listRoot = listArray[ i ].parent;
\r
- listArray[ i ].parent = new CKEDITOR.dom.element( listRoot.getName(), listRoot.getDocument() );
\r
+ if ( indentOffset > 0 )
\r
+ {
\r
+ var listRoot = listArray[ i ].parent;
\r
+ listArray[ i ].parent = new CKEDITOR.dom.element( listRoot.getName(), listRoot.getDocument() );
\r
+ }
\r
}
\r
\r
for ( i = lastItem.getCustomData( 'listarray_index' ) + 1 ;
\r
}
\r
\r
for ( i = lastItem.getCustomData( 'listarray_index' ) + 1 ;
\r
@@
-451,7
+457,7
@@
For licensing, see LICENSE.html or http://ckeditor.com/license
* and instead the {@link #indentUnit} and {@link #indentOffset} properties will be used.
\r
* @name CKEDITOR.config.indentClasses
\r
* @type Array
\r
* and instead the {@link #indentUnit} and {@link #indentOffset} properties will be used.
\r
* @name CKEDITOR.config.indentClasses
\r
* @type Array
\r
- * default null
\r
+ * @default null
\r
* @example
\r
* // Use the classes 'Indent1', 'Indent2', 'Indent3'
\r
* config.indentClasses = ['Indent1', 'Indent2', 'Indent3'];
\r
* @example
\r
* // Use the classes 'Indent1', 'Indent2', 'Indent3'
\r
* config.indentClasses = ['Indent1', 'Indent2', 'Indent3'];
\r