/*\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
bookmarks = CKEDITOR.dom.walker.bookmark(),\r
nonEmpty = function( node ){ return !( whitespaces( node ) || bookmarks( node ) ); };\r
\r
+ function cleanUpDirection( element )\r
+ {\r
+ var dir, parent, parentDir;\r
+ if ( ( dir = element.getDirection() ) )\r
+ {\r
+ parent = element.getParent();\r
+ while ( parent && !( parentDir = parent.getDirection() ) )\r
+ parent = parent.getParent();\r
+\r
+ if ( dir == parentDir )\r
+ element.removeAttribute( 'dir' );\r
+ }\r
+ }\r
+\r
CKEDITOR.plugins.list = {\r
/*\r
* Convert a DOM list tree into a data structure that is easier to\r
{\r
var listItem = listNode.getChild( i );\r
\r
+ // Fixing malformed nested lists by moving it into a previous list item. (#6236)\r
+ if( listItem.type == CKEDITOR.NODE_ELEMENT && listItem.getName() in CKEDITOR.dtd.$list )\r
+ CKEDITOR.plugins.list.listToArray( listItem, database, baseArray, baseIndentLevel + 1 );\r
+\r
// It may be a text node or some funny stuff.\r
if ( listItem.$.nodeName.toLowerCase() != 'li' )\r
continue;\r
currentIndex = baseIndex,\r
indentLevel = Math.max( listArray[ baseIndex ].indent, 0 ),\r
currentListItem = null,\r
+ orgDir,\r
paragraphName = ( paragraphMode == CKEDITOR.ENTER_P ? 'p' : 'div' );\r
while ( 1 )\r
{\r
var item = listArray[ currentIndex ];\r
+\r
+ orgDir = item.element.getDirection( 1 );\r
+\r
if ( item.indent == indentLevel )\r
{\r
if ( !rootNode || listArray[ currentIndex ].parent.getName() != rootNode.getName() )\r
retval.append( rootNode );\r
}\r
currentListItem = rootNode.append( item.element.clone( 0, 1 ) );\r
+\r
+ if ( orgDir != rootNode.getDirection( 1 ) )\r
+ currentListItem.setAttribute( 'dir', orgDir );\r
+\r
for ( var i = 0 ; i < item.contents.length ; i++ )\r
currentListItem.append( item.contents[i].clone( 1, 1 ) );\r
currentIndex++;\r
}\r
else if ( item.indent == Math.max( indentLevel, 0 ) + 1 )\r
{\r
- var listData = CKEDITOR.plugins.list.arrayToList( listArray, null, currentIndex, paragraphMode );\r
+ // Maintain original direction (#6861).\r
+ var currDir = listArray[ currentIndex - 1 ].element.getDirection( 1 ),\r
+ listData = CKEDITOR.plugins.list.arrayToList( listArray, null, currentIndex, paragraphMode,\r
+ currDir != orgDir ? orgDir: null );\r
+\r
+ // If the next block is an <li> with another list tree as the first\r
+ // child, we'll need to append a filler (<br>/NBSP) or the list item\r
+ // wouldn't be editable. (#6724)\r
+ if ( !currentListItem.getChildCount() && CKEDITOR.env.ie && !( doc.$.documentMode > 7 ))\r
+ currentListItem.append( doc.createText( '\xa0' ) );\r
currentListItem.append( listData.listNode );\r
currentIndex = listData.nextIndex;\r
}\r
else if ( item.indent == -1 && !baseIndex && item.grandparent )\r
{\r
- currentListItem;\r
if ( listNodeNames[ item.grandparent.getName() ] )\r
currentListItem = item.element.clone( false, true );\r
else\r
{\r
// Create completely new blocks here.\r
- if ( dir || item.element.hasAttributes() ||\r
- ( paragraphMode != CKEDITOR.ENTER_BR && item.grandparent.getName() != 'td' ) )\r
+ if ( dir || item.element.hasAttributes() || paragraphMode != CKEDITOR.ENTER_BR )\r
{\r
currentListItem = doc.createElement( paragraphName );\r
item.element.copyAttributes( currentListItem, { type:1, value:1 } );\r
- dir && currentListItem.setAttribute( 'dir', dir );\r
\r
// There might be a case where there are no attributes in the element after all\r
// (i.e. when "type" or "value" are the only attributes set). In this case, if enterMode = BR,\r
currentListItem = new CKEDITOR.dom.documentFragment( doc );\r
}\r
\r
+ if ( currentListItem.type == CKEDITOR.NODE_ELEMENT )\r
+ {\r
+ if ( item.grandparent.getDirection( 1 ) != orgDir )\r
+ currentListItem.setAttribute( 'dir', orgDir );\r
+ }\r
+\r
for ( i = 0 ; i < item.contents.length ; i++ )\r
currentListItem.append( item.contents[i].clone( 1, 1 ) );\r
\r
break;\r
}\r
\r
- // Clear marker attributes for the new list tree made of cloned nodes, if any.\r
if ( database )\r
{\r
- var currentNode = retval.getFirst();\r
+ var currentNode = retval.getFirst(),\r
+ listRoot = listArray[ 0 ].parent;\r
+\r
while ( currentNode )\r
{\r
if ( currentNode.type == CKEDITOR.NODE_ELEMENT )\r
+ {\r
+ // Clear marker attributes for the new list tree made of cloned nodes, if any.\r
CKEDITOR.dom.element.clearMarkers( database, currentNode );\r
+\r
+ // Clear redundant direction attribute specified on list items.\r
+ if ( currentNode.getName() in CKEDITOR.dtd.$listItem )\r
+ cleanUpDirection( currentNode );\r
+ }\r
+\r
currentNode = currentNode.getNextSourceNode();\r
}\r
}\r
}\r
};\r
\r
- function setState( editor, state )\r
- {\r
- editor.getCommand( this.name ).setState( state );\r
- }\r
-\r
function onSelectionChange( evt )\r
{\r
+ if ( evt.editor.readOnly )\r
+ return null;\r
+\r
var path = evt.data.path,\r
blockLimit = path.blockLimit,\r
elements = path.elements,\r
- element;\r
+ element,\r
+ i;\r
\r
// Grouping should only happen under blockLimit.(#3940).\r
- for ( var i = 0 ; i < elements.length && ( element = elements[ i ] )\r
+ for ( i = 0 ; i < elements.length && ( element = elements[ i ] )\r
&& !element.equals( blockLimit ); i++ )\r
{\r
- if ( listNodeNames[ elements[i].getName() ] )\r
- {\r
- return setState.call( this, evt.editor,\r
- this.type == elements[i].getName() ? CKEDITOR.TRISTATE_ON : CKEDITOR.TRISTATE_OFF );\r
- }\r
+ if ( listNodeNames[ elements[ i ].getName() ] )\r
+ return this.setState( this.type == elements[ i ].getName() ? CKEDITOR.TRISTATE_ON : CKEDITOR.TRISTATE_OFF );\r
}\r
\r
- return setState.call( this, evt.editor, CKEDITOR.TRISTATE_OFF );\r
+ return this.setState( CKEDITOR.TRISTATE_OFF );\r
}\r
\r
function changeListType( editor, groupObj, database, listsCreated )\r
contentBlock.appendTo( listItem );\r
else\r
{\r
- // Remove DIR attribute if it was merged into list root.\r
+ contentBlock.copyAttributes( listItem );\r
+ // Remove direction attribute after it was merged into list root. (#7657)\r
if ( listDir && contentBlock.getDirection() )\r
{\r
- contentBlock.removeStyle( 'direction' );\r
- contentBlock.removeAttribute( 'dir' );\r
+ listItem.removeStyle( 'direction' );\r
+ listItem.removeAttribute( 'dir' );\r
}\r
-\r
- contentBlock.copyAttributes( listItem );\r
contentBlock.moveChildren( listItem );\r
contentBlock.remove();\r
}\r
this.type = type;\r
}\r
\r
+ // Move direction attribute from root to list items.\r
+ function dirToListItems( list )\r
+ {\r
+ var dir = list.getDirection();\r
+ if ( dir )\r
+ {\r
+ for ( var i = 0, children = list.getChildren(), child; child = children.getItem( i ), i < children.count(); i++ )\r
+ {\r
+ if ( child.type == CKEDITOR.NODE_ELEMENT && child.is( 'li' ) && !child.getDirection() )\r
+ child.setAttribute( 'dir', dir );\r
+ }\r
+\r
+ list.removeAttribute( 'dir' );\r
+ }\r
+ }\r
+\r
listCommand.prototype = {\r
exec : function( editor )\r
{\r
- editor.focus();\r
-\r
var doc = editor.document,\r
+ config = editor.config,\r
selection = editor.getSelection(),\r
ranges = selection && selection.getRanges( true );\r
\r
if ( this.state == CKEDITOR.TRISTATE_OFF )\r
{\r
var body = doc.getBody();\r
- body.trim();\r
- if ( !body.getFirst() )\r
+ if ( !body.getFirst( nonEmpty ) )\r
{\r
- var paragraph = doc.createElement( editor.config.enterMode == CKEDITOR.ENTER_P ? 'p' :\r
- ( editor.config.enterMode == CKEDITOR.ENTER_DIV ? 'div' : 'br' ) );\r
- paragraph.appendTo( body );\r
- ranges = new CKEDITOR.dom.rangeList( [ new CKEDITOR.dom.range( doc ) ] );\r
- // IE exception on inserting anything when anchor inside <br>.\r
- if ( paragraph.is( 'br' ) )\r
- {\r
- ranges[ 0 ].setStartBefore( paragraph );\r
- ranges[ 0 ].setEndAfter( paragraph );\r
- }\r
- else\r
- ranges[ 0 ].selectNodeContents( paragraph );\r
+ config.enterMode == CKEDITOR.ENTER_BR ?\r
+ body.appendBogus() :\r
+ ranges[ 0 ].fixBlock( 1, config.enterMode == CKEDITOR.ENTER_P ? 'p' : 'div' );\r
+\r
selection.selectRanges( ranges );\r
}\r
// Maybe a single range there enclosing the whole list,\r
enclosedNode = range && range.getEnclosedNode();\r
if ( enclosedNode && enclosedNode.is\r
&& this.type == enclosedNode.getName() )\r
- setState.call( this, editor, CKEDITOR.TRISTATE_ON );\r
+ this.setState( CKEDITOR.TRISTATE_ON );\r
}\r
}\r
\r
if ( sibling && sibling.getName &&\r
sibling.getName() == listCommand.type )\r
{\r
+\r
+ // In case to be merged lists have difference directions. (#7448)\r
+ if ( sibling.getDirection( 1 ) != listNode.getDirection( 1 ) )\r
+ dirToListItems( listNode.getDirection() ? listNode : sibling );\r
+\r
sibling.remove();\r
// Move children order by merge direction.(#3820)\r
sibling.moveChildren( listNode, rtl );\r
init : function( editor )\r
{\r
// Register commands.\r
- var numberedListCommand = new listCommand( 'numberedlist', 'ol' ),\r
- bulletedListCommand = new listCommand( 'bulletedlist', 'ul' );\r
- editor.addCommand( 'numberedlist', numberedListCommand );\r
- editor.addCommand( 'bulletedlist', bulletedListCommand );\r
+ var numberedListCommand = editor.addCommand( 'numberedlist', new listCommand( 'numberedlist', 'ol' ) ),\r
+ bulletedListCommand = editor.addCommand( 'bulletedlist', new listCommand( 'bulletedlist', 'ul' ) );\r
\r
// Register the toolbar button.\r
editor.ui.addButton( 'NumberedList',\r
Got questions, comments, patches, etc.? Contact Jason Woofenden