/*\r
-Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved.\r
+Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.\r
For licensing, see LICENSE.html or http://ckeditor.com/license\r
*/\r
\r
\r
(function()\r
{\r
- var listNodeNames = { ol : 1, ul : 1 };\r
-\r
- var isNotWhitespaces = CKEDITOR.dom.walker.whitespaces( true ),\r
+ var listNodeNames = { ol : 1, ul : 1 },\r
+ isNotWhitespaces = CKEDITOR.dom.walker.whitespaces( true ),\r
isNotBookmark = CKEDITOR.dom.walker.bookmark( false, true );\r
\r
- function setState( editor, state )\r
- {\r
- editor.getCommand( this.name ).setState( state );\r
- }\r
-\r
function onSelectionChange( evt )\r
{\r
- var elements = evt.data.path.elements,\r
- listNode, listItem,\r
- editor = evt.editor;\r
+ var editor = evt.editor;\r
\r
- for ( var i = 0 ; i < elements.length ; i++ )\r
- {\r
- if ( elements[i].getName() == 'li' )\r
- {\r
- listItem = elements[i];\r
- continue;\r
- }\r
- if ( listNodeNames[ elements[i].getName() ] )\r
- {\r
- listNode = elements[i];\r
- break;\r
- }\r
- }\r
+ var elementPath = evt.data.path,\r
+ list = elementPath && elementPath.contains( listNodeNames );\r
\r
- if ( listNode )\r
- {\r
- if ( this.name == 'outdent' )\r
- return setState.call( this, editor, CKEDITOR.TRISTATE_OFF );\r
- else\r
- {\r
- while ( listItem && ( listItem = listItem.getPrevious( CKEDITOR.dom.walker.whitespaces( true ) ) ) )\r
- {\r
- if ( listItem.getName && listItem.getName() == 'li' )\r
- return setState.call( this, editor, CKEDITOR.TRISTATE_OFF );\r
- }\r
- return setState.call( this, editor, CKEDITOR.TRISTATE_DISABLED );\r
- }\r
- }\r
+ if ( list )\r
+ return this.setState( CKEDITOR.TRISTATE_OFF );\r
\r
if ( !this.useIndentClasses && this.name == 'indent' )\r
- return setState.call( this, editor, CKEDITOR.TRISTATE_OFF );\r
+ return this.setState( CKEDITOR.TRISTATE_OFF );\r
\r
var path = evt.data.path,\r
firstBlock = path.block || path.blockLimit;\r
if ( !firstBlock )\r
- return setState.call( this, editor, CKEDITOR.TRISTATE_DISABLED );\r
+ return this.setState( CKEDITOR.TRISTATE_DISABLED );\r
\r
if ( this.useIndentClasses )\r
{\r
}\r
if ( ( this.name == 'outdent' && !indentStep ) ||\r
( this.name == 'indent' && indentStep == editor.config.indentClasses.length ) )\r
- return setState.call( this, editor, CKEDITOR.TRISTATE_DISABLED );\r
- return setState.call( this, editor, CKEDITOR.TRISTATE_OFF );\r
+ return this.setState( CKEDITOR.TRISTATE_DISABLED );\r
+ return this.setState( CKEDITOR.TRISTATE_OFF );\r
}\r
else\r
{\r
- var indent = parseInt( firstBlock.getStyle( this.indentCssProperty ), 10 );\r
+ var indent = parseInt( firstBlock.getStyle( getIndentCssProperty( firstBlock ) ), 10 );\r
if ( isNaN( indent ) )\r
indent = 0;\r
if ( indent <= 0 )\r
- return setState.call( this, editor, CKEDITOR.TRISTATE_DISABLED );\r
- return setState.call( this, editor, CKEDITOR.TRISTATE_OFF );\r
+ return this.setState( CKEDITOR.TRISTATE_DISABLED );\r
+ return this.setState( CKEDITOR.TRISTATE_OFF );\r
}\r
}\r
\r
- function indentList( editor, range, listNode )\r
+ function indentCommand( editor, name )\r
{\r
- // Our starting and ending points of the range might be inside some blocks under a list item...\r
- // So before playing with the iterator, we need to expand the block to include the list items.\r
- var startContainer = range.startContainer,\r
- endContainer = range.endContainer;\r
- while ( startContainer && !startContainer.getParent().equals( listNode ) )\r
- startContainer = startContainer.getParent();\r
- while ( endContainer && !endContainer.getParent().equals( listNode ) )\r
- endContainer = endContainer.getParent();\r
-\r
- if ( !startContainer || !endContainer )\r
- return;\r
-\r
- // Now we can iterate over the individual items on the same tree depth.\r
- var block = startContainer,\r
- itemsToMove = [],\r
- stopFlag = false;\r
- while ( !stopFlag )\r
- {\r
- if ( block.equals( endContainer ) )\r
- stopFlag = true;\r
- itemsToMove.push( block );\r
- block = block.getNext();\r
- }\r
- if ( itemsToMove.length < 1 )\r
- return;\r
-\r
- // Do indent or outdent operations on the array model of the list, not the\r
- // list's DOM tree itself. The array model demands that it knows as much as\r
- // possible about the surrounding lists, we need to feed it the further\r
- // ancestor node that is still a list.\r
- var listParents = listNode.getParents( true );\r
- for ( var i = 0 ; i < listParents.length ; i++ )\r
+ this.name = name;\r
+ this.useIndentClasses = editor.config.indentClasses && editor.config.indentClasses.length > 0;\r
+ if ( this.useIndentClasses )\r
{\r
- if ( listParents[i].getName && listNodeNames[ listParents[i].getName() ] )\r
- {\r
- listNode = listParents[i];\r
- break;\r
- }\r
+ this.classNameRegex = new RegExp( '(?:^|\\s+)(' + editor.config.indentClasses.join( '|' ) + ')(?=$|\\s)' );\r
+ this.indentClassMap = {};\r
+ for ( var i = 0 ; i < editor.config.indentClasses.length ; i++ )\r
+ this.indentClassMap[ editor.config.indentClasses[i] ] = i + 1;\r
}\r
- var indentOffset = this.name == 'indent' ? 1 : -1,\r
- startItem = itemsToMove[0],\r
- lastItem = itemsToMove[ itemsToMove.length - 1 ],\r
- database = {};\r
-\r
- // Convert the list DOM tree into a one dimensional array.\r
- var listArray = CKEDITOR.plugins.list.listToArray( listNode, database );\r
\r
- // Apply indenting or outdenting on the array.\r
- var baseIndent = listArray[ lastItem.getCustomData( 'listarray_index' ) ].indent;\r
- for ( i = startItem.getCustomData( 'listarray_index' ); i <= lastItem.getCustomData( 'listarray_index' ); i++ )\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
- }\r
+ this.startDisabled = name == 'outdent';\r
+ }\r
\r
- for ( i = lastItem.getCustomData( 'listarray_index' ) + 1 ;\r
- i < listArray.length && listArray[i].indent > baseIndent ; i++ )\r
- listArray[i].indent += indentOffset;\r
+ // Returns the CSS property to be used for identing a given element.\r
+ function getIndentCssProperty( element, dir )\r
+ {\r
+ return ( dir || element.getComputedStyle( 'direction' ) ) == 'ltr' ? 'margin-left' : 'margin-right';\r
+ }\r
\r
- // Convert the array back to a DOM forest (yes we might have a few subtrees now).\r
- // And replace the old list with the new forest.\r
- var newList = CKEDITOR.plugins.list.arrayToList( listArray, database, null, editor.config.enterMode, 0 );\r
+ function isListItem( node )\r
+ {\r
+ return node.type = CKEDITOR.NODE_ELEMENT && node.is( 'li' );\r
+ }\r
\r
- // Avoid nested <li> after outdent even they're visually same,\r
- // recording them for later refactoring.(#3982)\r
- if ( this.name == 'outdent' )\r
+ indentCommand.prototype = {\r
+ exec : function( editor )\r
{\r
- var parentLiElement;\r
- if ( ( parentLiElement = listNode.getParent() ) && parentLiElement.is( 'li' ) )\r
+ var self = this, database = {};\r
+\r
+ function indentList( listNode )\r
{\r
- var children = newList.listNode.getChildren(),\r
- pendingLis = [],\r
- count = children.count(),\r
- child;\r
+ // Our starting and ending points of the range might be inside some blocks under a list item...\r
+ // So before playing with the iterator, we need to expand the block to include the list items.\r
+ var startContainer = range.startContainer,\r
+ endContainer = range.endContainer;\r
+ while ( startContainer && !startContainer.getParent().equals( listNode ) )\r
+ startContainer = startContainer.getParent();\r
+ while ( endContainer && !endContainer.getParent().equals( listNode ) )\r
+ endContainer = endContainer.getParent();\r
+\r
+ if ( !startContainer || !endContainer )\r
+ return;\r
+\r
+ // Now we can iterate over the individual items on the same tree depth.\r
+ var block = startContainer,\r
+ itemsToMove = [],\r
+ stopFlag = false;\r
+ while ( !stopFlag )\r
+ {\r
+ if ( block.equals( endContainer ) )\r
+ stopFlag = true;\r
+ itemsToMove.push( block );\r
+ block = block.getNext();\r
+ }\r
+ if ( itemsToMove.length < 1 )\r
+ return;\r
+\r
+ // Do indent or outdent operations on the array model of the list, not the\r
+ // list's DOM tree itself. The array model demands that it knows as much as\r
+ // possible about the surrounding lists, we need to feed it the further\r
+ // ancestor node that is still a list.\r
+ var listParents = listNode.getParents( true );\r
+ for ( var i = 0 ; i < listParents.length ; i++ )\r
+ {\r
+ if ( listParents[i].getName && listNodeNames[ listParents[i].getName() ] )\r
+ {\r
+ listNode = listParents[i];\r
+ break;\r
+ }\r
+ }\r
+ var indentOffset = self.name == 'indent' ? 1 : -1,\r
+ startItem = itemsToMove[0],\r
+ lastItem = itemsToMove[ itemsToMove.length - 1 ];\r
\r
- for ( i = count - 1 ; i >= 0 ; i-- )\r
+ // Convert the list DOM tree into a one dimensional array.\r
+ var listArray = CKEDITOR.plugins.list.listToArray( listNode, database );\r
+\r
+ // Apply indenting or outdenting on the array.\r
+ var baseIndent = listArray[ lastItem.getCustomData( 'listarray_index' ) ].indent;\r
+ for ( i = startItem.getCustomData( 'listarray_index' ); i <= lastItem.getCustomData( 'listarray_index' ); i++ )\r
{\r
- if ( ( child = children.getItem( i ) ) && child.is && child.is( 'li' ) )\r
- pendingLis.push( child );\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
}\r
- }\r
- }\r
\r
- if ( newList )\r
- newList.listNode.replace( listNode );\r
+ for ( i = lastItem.getCustomData( 'listarray_index' ) + 1 ;\r
+ i < listArray.length && listArray[i].indent > baseIndent ; i++ )\r
+ listArray[i].indent += indentOffset;\r
\r
- // Move the nested <li> to be appeared after the parent.\r
- if ( pendingLis && pendingLis.length )\r
- {\r
- for ( i = 0; i < pendingLis.length ; i++ )\r
- {\r
- var li = pendingLis[ i ],\r
- followingList = li;\r
+ // Convert the array back to a DOM forest (yes we might have a few subtrees now).\r
+ // And replace the old list with the new forest.\r
+ var newList = CKEDITOR.plugins.list.arrayToList( listArray, database, null, editor.config.enterMode, listNode.getDirection() );\r
\r
- // Nest preceding <ul>/<ol> inside current <li> if any.\r
- while ( ( followingList = followingList.getNext() ) &&\r
- followingList.is &&\r
- followingList.getName() in listNodeNames )\r
+ // Avoid nested <li> after outdent even they're visually same,\r
+ // recording them for later refactoring.(#3982)\r
+ if ( self.name == 'outdent' )\r
{\r
- // IE requires a filler NBSP for nested list inside empty list item,\r
- // otherwise the list item will be inaccessiable. (#4476)\r
- if ( CKEDITOR.env.ie && !li.getFirst( function( node ){ return isNotWhitespaces( node ) && isNotBookmark( node ); } ) )\r
- li.append( range.document.createText( '\u00a0' ) );\r
-\r
- li.append( followingList );\r
+ var parentLiElement;\r
+ if ( ( parentLiElement = listNode.getParent() ) && parentLiElement.is( 'li' ) )\r
+ {\r
+ var children = newList.listNode.getChildren(),\r
+ pendingLis = [],\r
+ count = children.count(),\r
+ child;\r
+\r
+ for ( i = count - 1 ; i >= 0 ; i-- )\r
+ {\r
+ if ( ( child = children.getItem( i ) ) && child.is && child.is( 'li' ) )\r
+ pendingLis.push( child );\r
+ }\r
+ }\r
}\r
\r
- li.insertAfter( parentLiElement );\r
- }\r
- }\r
+ if ( newList )\r
+ newList.listNode.replace( listNode );\r
\r
- // Clean up the markers.\r
- CKEDITOR.dom.element.clearAllMarkers( database );\r
- }\r
+ // Move the nested <li> to be appeared after the parent.\r
+ if ( pendingLis && pendingLis.length )\r
+ {\r
+ for ( i = 0; i < pendingLis.length ; i++ )\r
+ {\r
+ var li = pendingLis[ i ],\r
+ followingList = li;\r
+\r
+ // Nest preceding <ul>/<ol> inside current <li> if any.\r
+ while ( ( followingList = followingList.getNext() ) &&\r
+ followingList.is &&\r
+ followingList.getName() in listNodeNames )\r
+ {\r
+ // IE requires a filler NBSP for nested list inside empty list item,\r
+ // otherwise the list item will be inaccessiable. (#4476)\r
+ if ( CKEDITOR.env.ie && !li.getFirst( function( node ){ return isNotWhitespaces( node ) && isNotBookmark( node ); } ) )\r
+ li.append( range.document.createText( '\u00a0' ) );\r
+\r
+ li.append( followingList );\r
+ }\r
+\r
+ li.insertAfter( parentLiElement );\r
+ }\r
+ }\r
+ }\r
\r
- function indentBlock( editor, range )\r
- {\r
- var iterator = range.createIterator(),\r
- enterMode = editor.config.enterMode;\r
- iterator.enforceRealBlocks = true;\r
- iterator.enlargeBr = enterMode != CKEDITOR.ENTER_BR;\r
- var block;\r
- while ( ( block = iterator.getNextParagraph() ) )\r
- {\r
+ function indentBlock()\r
+ {\r
+ var iterator = range.createIterator(),\r
+ enterMode = editor.config.enterMode;\r
+ iterator.enforceRealBlocks = true;\r
+ iterator.enlargeBr = enterMode != CKEDITOR.ENTER_BR;\r
+ var block;\r
+ while ( ( block = iterator.getNextParagraph( enterMode == CKEDITOR.ENTER_P ? 'p' : 'div' ) ) )\r
+ indentElement( block );\r
+ }\r
\r
- if ( this.useIndentClasses )\r
+ function indentElement( element, dir )\r
{\r
- // Transform current class name to indent step index.\r
- var indentClass = block.$.className.match( this.classNameRegex ),\r
- indentStep = 0;\r
- if ( indentClass )\r
+ if ( element.getCustomData( 'indent_processed' ) )\r
+ return false;\r
+\r
+ if ( self.useIndentClasses )\r
{\r
- indentClass = indentClass[1];\r
- indentStep = this.indentClassMap[ indentClass ];\r
+ // Transform current class name to indent step index.\r
+ var indentClass = element.$.className.match( self.classNameRegex ),\r
+ indentStep = 0;\r
+ if ( indentClass )\r
+ {\r
+ indentClass = indentClass[1];\r
+ indentStep = self.indentClassMap[ indentClass ];\r
+ }\r
+\r
+ // Operate on indent step index, transform indent step index back to class\r
+ // name.\r
+ if ( self.name == 'outdent' )\r
+ indentStep--;\r
+ else\r
+ indentStep++;\r
+\r
+ if ( indentStep < 0 )\r
+ return false;\r
+\r
+ indentStep = Math.min( indentStep, editor.config.indentClasses.length );\r
+ indentStep = Math.max( indentStep, 0 );\r
+ element.$.className = CKEDITOR.tools.ltrim( element.$.className.replace( self.classNameRegex, '' ) );\r
+ if ( indentStep > 0 )\r
+ element.addClass( editor.config.indentClasses[ indentStep - 1 ] );\r
}\r
-\r
- // Operate on indent step index, transform indent step index back to class\r
- // name.\r
- if ( this.name == 'outdent' )\r
- indentStep--;\r
else\r
- indentStep++;\r
- indentStep = Math.min( indentStep, editor.config.indentClasses.length );\r
- indentStep = Math.max( indentStep, 0 );\r
- var className = CKEDITOR.tools.ltrim( block.$.className.replace( this.classNameRegex, '' ) );\r
- if ( indentStep < 1 )\r
- block.$.className = className;\r
- else\r
- block.$.className = CKEDITOR.tools.ltrim( className + ' ' + editor.config.indentClasses[ indentStep - 1 ] );\r
+ {\r
+ var indentCssProperty = getIndentCssProperty( element, dir ),\r
+ currentOffset = parseInt( element.getStyle( indentCssProperty ), 10 );\r
+ if ( isNaN( currentOffset ) )\r
+ currentOffset = 0;\r
+ var indentOffset = editor.config.indentOffset || 40;\r
+ currentOffset += ( self.name == 'indent' ? 1 : -1 ) * indentOffset;\r
+\r
+ if ( currentOffset < 0 )\r
+ return false;\r
+\r
+ currentOffset = Math.max( currentOffset, 0 );\r
+ currentOffset = Math.ceil( currentOffset / indentOffset ) * indentOffset;\r
+ element.setStyle( indentCssProperty, currentOffset ? currentOffset + ( editor.config.indentUnit || 'px' ) : '' );\r
+ if ( element.getAttribute( 'style' ) === '' )\r
+ element.removeAttribute( 'style' );\r
+ }\r
+\r
+ CKEDITOR.dom.element.setMarker( database, element, 'indent_processed', 1 );\r
+ return true;\r
}\r
- else\r
+\r
+ var selection = editor.getSelection(),\r
+ bookmarks = selection.createBookmarks( 1 ),\r
+ ranges = selection && selection.getRanges( 1 ),\r
+ range;\r
+\r
+\r
+ var iterator = ranges.createIterator();\r
+ while ( ( range = iterator.getNextRange() ) )\r
{\r
- var currentOffset = parseInt( block.getStyle( this.indentCssProperty ), 10 );\r
- if ( isNaN( currentOffset ) )\r
- currentOffset = 0;\r
- currentOffset += ( this.name == 'indent' ? 1 : -1 ) * editor.config.indentOffset;\r
- currentOffset = Math.max( currentOffset, 0 );\r
- currentOffset = Math.ceil( currentOffset / editor.config.indentOffset ) * editor.config.indentOffset;\r
- block.setStyle( this.indentCssProperty, currentOffset ? currentOffset + editor.config.indentUnit : '' );\r
- if ( block.getAttribute( 'style' ) === '' )\r
- block.removeAttribute( 'style' );\r
- }\r
- }\r
- }\r
+ var rangeRoot = range.getCommonAncestor(),\r
+ nearestListBlock = rangeRoot;\r
\r
- function indentCommand( editor, name )\r
- {\r
- this.name = name;\r
- this.useIndentClasses = editor.config.indentClasses && editor.config.indentClasses.length > 0;\r
- if ( this.useIndentClasses )\r
- {\r
- this.classNameRegex = new RegExp( '(?:^|\\s+)(' + editor.config.indentClasses.join( '|' ) + ')(?=$|\\s)' );\r
- this.indentClassMap = {};\r
- for ( var i = 0 ; i < editor.config.indentClasses.length ; i++ )\r
- this.indentClassMap[ editor.config.indentClasses[i] ] = i + 1;\r
- }\r
- else\r
- this.indentCssProperty = editor.config.contentsLangDirection == 'ltr' ? 'margin-left' : 'margin-right';\r
- this.startDisabled = name == 'outdent';\r
- }\r
+ while ( nearestListBlock && !( nearestListBlock.type == CKEDITOR.NODE_ELEMENT &&\r
+ listNodeNames[ nearestListBlock.getName() ] ) )\r
+ nearestListBlock = nearestListBlock.getParent();\r
\r
- indentCommand.prototype = {\r
- exec : function( editor )\r
- {\r
- var selection = editor.getSelection(),\r
- range = selection && selection.getRanges()[0];\r
+ // Avoid having selection enclose the entire list. (#6138)\r
+ // [<ul><li>...</li></ul>] =><ul><li>[...]</li></ul>\r
+ if ( !nearestListBlock )\r
+ {\r
+ var selectedNode = range.getEnclosedNode();\r
+ if ( selectedNode\r
+ && selectedNode.type == CKEDITOR.NODE_ELEMENT\r
+ && selectedNode.getName() in listNodeNames)\r
+ {\r
+ range.setStartAt( selectedNode, CKEDITOR.POSITION_AFTER_START );\r
+ range.setEndAt( selectedNode, CKEDITOR.POSITION_BEFORE_END );\r
+ nearestListBlock = selectedNode;\r
+ }\r
+ }\r
\r
- if ( !selection || !range )\r
- return;\r
+ // Avoid selection anchors under list root.\r
+ // <ul>[<li>...</li>]</ul> => <ul><li>[...]</li></ul>\r
+ if ( nearestListBlock && range.startContainer.type == CKEDITOR.NODE_ELEMENT\r
+ && range.startContainer.getName() in listNodeNames )\r
+ {\r
+ var walker = new CKEDITOR.dom.walker( range );\r
+ walker.evaluator = isListItem;\r
+ range.startContainer = walker.next();\r
+ }\r
\r
- var bookmarks = selection.createBookmarks( true ),\r
- nearestListBlock = range.getCommonAncestor();\r
+ if ( nearestListBlock && range.endContainer.type == CKEDITOR.NODE_ELEMENT\r
+ && range.endContainer.getName() in listNodeNames )\r
+ {\r
+ walker = new CKEDITOR.dom.walker( range );\r
+ walker.evaluator = isListItem;\r
+ range.endContainer = walker.previous();\r
+ }\r
\r
- while ( nearestListBlock && !( nearestListBlock.type == CKEDITOR.NODE_ELEMENT &&\r
- listNodeNames[ nearestListBlock.getName() ] ) )\r
- nearestListBlock = nearestListBlock.getParent();\r
+ if ( nearestListBlock )\r
+ {\r
+ var firstListItem = nearestListBlock.getFirst( isListItem ),\r
+ hasMultipleItems = !!firstListItem.getNext( isListItem ),\r
+ rangeStart = range.startContainer,\r
+ indentWholeList = firstListItem.equals( rangeStart ) || firstListItem.contains( rangeStart );\r
+\r
+ // Indent the entire list if cursor is inside the first list item. (#3893)\r
+ // Only do that for indenting or when using indent classes or when there is something to outdent. (#6141)\r
+ if ( !( indentWholeList &&\r
+ ( self.name == 'indent' || self.useIndentClasses || parseInt( nearestListBlock.getStyle( getIndentCssProperty( nearestListBlock ) ), 10 ) ) &&\r
+ indentElement( nearestListBlock, !hasMultipleItems && firstListItem.getDirection() ) ) )\r
+ indentList( nearestListBlock );\r
+ }\r
+ else\r
+ indentBlock();\r
+ }\r
\r
- if ( nearestListBlock )\r
- indentList.call( this, editor, range, nearestListBlock );\r
- else\r
- indentBlock.call( this, editor, range );\r
+ // Clean up the markers.\r
+ CKEDITOR.dom.element.clearAllMarkers( database );\r
\r
- editor.focus();\r
editor.forceNextSelectionCheck();\r
selection.selectBookmarks( bookmarks );\r
}\r
init : function( editor )\r
{\r
// Register commands.\r
- var indent = new indentCommand( editor, 'indent' ),\r
- outdent = new indentCommand( editor, 'outdent' );\r
- editor.addCommand( 'indent', indent );\r
- editor.addCommand( 'outdent', outdent );\r
+ var indent = editor.addCommand( 'indent', new indentCommand( editor, 'indent' ) ),\r
+ outdent = editor.addCommand( 'outdent', new indentCommand( editor, 'outdent' ) );\r
\r
// Register the toolbar buttons.\r
editor.ui.addButton( 'Indent',\r
// Register the state changing handlers.\r
editor.on( 'selectionChange', CKEDITOR.tools.bind( onSelectionChange, indent ) );\r
editor.on( 'selectionChange', CKEDITOR.tools.bind( onSelectionChange, outdent ) );\r
- },\r
\r
- requires : [ 'domiterator', 'list' ]\r
- } );\r
-})();\r
+ // [IE6/7] Raw lists are using margin instead of padding for visual indentation in wysiwyg mode. (#3893)\r
+ if ( CKEDITOR.env.ie6Compat || CKEDITOR.env.ie7Compat )\r
+ {\r
+ editor.addCss(\r
+ "ul,ol" +\r
+ "{" +\r
+ " margin-left: 0px;" +\r
+ " padding-left: 40px;" +\r
+ "}" );\r
+ }\r
\r
-CKEDITOR.tools.extend( CKEDITOR.config,\r
- {\r
- indentOffset : 40,\r
- indentUnit : 'px',\r
- indentClasses : null\r
- });\r
+ // Register dirChanged listener.\r
+ editor.on( 'dirChanged', function( e )\r
+ {\r
+ var range = new CKEDITOR.dom.range( editor.document );\r
+ range.setStartBefore( e.data.node );\r
+ range.setEndAfter( e.data.node );\r
\r
-/**\r
- * Size of each indentation step\r
- * @type Number\r
- * @example\r
- * config.indentOffset = 40;\r
- */\r
+ var walker = new CKEDITOR.dom.walker( range ),\r
+ node;\r
\r
- /**\r
- * Unit for the indentation style\r
- * @type String\r
- * @example\r
- * config.indentUnit = 'px';\r
- */\r
+ while ( ( node = walker.next() ) )\r
+ {\r
+ if ( node.type == CKEDITOR.NODE_ELEMENT )\r
+ {\r
+ // A child with the defined dir is to be ignored.\r
+ if ( !node.equals( e.data.node ) && node.getDirection() )\r
+ {\r
+ range.setStartAfter( node );\r
+ walker = new CKEDITOR.dom.walker( range );\r
+ continue;\r
+ }\r
+\r
+ // Switch alignment classes.\r
+ var classes = editor.config.indentClasses;\r
+ if ( classes )\r
+ {\r
+ var suffix = ( e.data.dir == 'ltr' ) ? [ '_rtl', '' ] : [ '', '_rtl' ];\r
+ for ( var i = 0; i < classes.length; i++ )\r
+ {\r
+ if ( node.hasClass( classes[ i ] + suffix[ 0 ] ) )\r
+ {\r
+ node.removeClass( classes[ i ] + suffix[ 0 ] );\r
+ node.addClass( classes[ i ] + suffix[ 1 ] );\r
+ }\r
+ }\r
+ }\r
+\r
+ // Switch the margins.\r
+ var marginLeft = node.getStyle( 'margin-right' ),\r
+ marginRight = node.getStyle( 'margin-left' );\r
+\r
+ marginLeft ? node.setStyle( 'margin-left', marginLeft ) : node.removeStyle( 'margin-left' );\r
+ marginRight ? node.setStyle( 'margin-right', marginRight ) : node.removeStyle( 'margin-right' );\r
+ }\r
+ }\r
+ });\r
+ },\r
\r
- /**\r
- * List of classes to use for indenting the contents.\r
- * @type Array\r
- * @example\r
- * // Don't use classes for indenting. (this is the default value)\r
- * config.indentClasses = null;\r
- * @example\r
- * // Use the classes 'Indent1', 'Indent2', 'Indent3'\r
- * config.indentClasses = ['Indent1', 'Indent2', 'Indent3'];\r
- */\r
+ requires : [ 'domiterator', 'list' ]\r
+ } );\r
+})();\r
\r
/**\r
* Size of each indentation step\r
+ * @name CKEDITOR.config.indentOffset\r
* @type Number\r
* @default 40\r
* @example\r
\r
/**\r
* Unit for the indentation style\r
+ * @name CKEDITOR.config.indentUnit\r
* @type String\r
* @default 'px'\r
* @example\r
/**\r
* List of classes to use for indenting the contents. If it's null, no classes will be used\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
* @example\r