Index: /CKEditor/trunk/_source/core/config.js =================================================================== --- /CKEditor/trunk/_source/core/config.js (revision 3050) +++ /CKEditor/trunk/_source/core/config.js (revision 3051) @@ -147,5 +147,5 @@ * config.plugins = 'basicstyles,button,htmldataprocessor,toolbar,wysiwygarea'; */ - plugins : 'basicstyles,button,elementspath,horizontalrule,htmldataprocessor,keystrokes,newpage,pagebreak,removeformat,smiley,link,sourcearea,table,specialchar,tab,toolbar,wysiwygarea', + plugins : 'basicstyles,button,elementspath,horizontalrule,htmldataprocessor,keystrokes,newpage,pagebreak,removeformat,smiley,link,list,sourcearea,table,specialchar,tab,toolbar,wysiwygarea', /** Index: /CKEditor/trunk/_source/core/dom/documentFragment.js =================================================================== --- /CKEditor/trunk/_source/core/dom/documentFragment.js (revision 3050) +++ /CKEditor/trunk/_source/core/dom/documentFragment.js (revision 3051) @@ -31,4 +31,6 @@ }, + moveChildren : elementPrototype.moveChildren, + insertAfterNode : function( node ) { @@ -44,5 +46,21 @@ else $parent.insertBefore( $, $node.nextSibling ); - } + }, + + replace : function( nodeToReplace ) + { + this.insertAfterNode( nodeToReplace ); + nodeToReplace.remove(); + }, + + trim : elementPrototype.trim, + ltrim : elementPrototype.ltrim, + rtrim : elementPrototype.rtrim, + getFirst : elementPrototype.getFirst, + getLast : elementPrototype.getLast, + getDocument : elementPrototype.getDocument, + getChildCount : elementPrototype.getChildCount, + getChild : elementPrototype.getChild, + contains : elementPrototype.contains }; })(); Index: /CKEditor/trunk/_source/core/dom/domobject.js =================================================================== --- /CKEditor/trunk/_source/core/dom/domobject.js (revision 3050) +++ /CKEditor/trunk/_source/core/dom/domobject.js (revision 3051) @@ -166,5 +166,17 @@ dataSlot = expandoNumber && customData[ expandoNumber ]; - return ( dataSlot && dataSlot[ key ] ) || null; + if ( dataSlot && dataSlot[ key ] !== undefined ) + return dataSlot[ key ]; + return null; + }; + + domObjectProto.removeCustomData = function( key ) + { + var expandoNumber = this.$._cke_expando, + dataSlot = expandoNumber && customData[ expandoNumber ], + retval = dataSlot[ key ]; + + delete dataSlot[ key ]; + return retval || null; }; Index: /CKEditor/trunk/_source/core/dom/element.js =================================================================== --- /CKEditor/trunk/_source/core/dom/element.js (revision 3050) +++ /CKEditor/trunk/_source/core/dom/element.js (revision 3051) @@ -74,4 +74,36 @@ }; +CKEDITOR.dom.element.setMarker = function( database, element, name, value ) +{ + var id = element.getCustomData( 'list_marker_id' ) || + ( element.setCustomData( 'list_marker_id', CKEDITOR.tools.getNextNumber() ).getCustomData( 'list_marker_id' ) ), + markerNames = element.getCustomData( 'list_marker_names' ) || + ( element.setCustomData( 'list_marker_names', {} ).getCustomData( 'list_marker_names' ) ); + database[id] = element; + markerNames[name] = 1; + + return element.setCustomData( name, value ); +}; + +CKEDITOR.dom.element.clearAllMarkers = function( database ) +{ + for ( var i in database ) + CKEDITOR.dom.element.clearMarkers( database, database[i], true ); +}; + +CKEDITOR.dom.element.clearMarkers = function( database, element, removeFromDatabase ) +{ + var names = element.getCustomData( 'list_marker_names' ), + id = element.getCustomData( 'list_marker_id' ); + for ( var i in names ) + element.removeCustomData( names[i] ); + element.removeCustomData( 'list_marker_names' ); + if ( removeFromDatabase ) + { + element.removeCustomData( 'list_marker_id' ); + delete database[id]; + } +}; + CKEDITOR.tools.extend( CKEDITOR.dom.element.prototype, /** @lends CKEDITOR.dom.element.prototype */ Index: /CKEditor/trunk/_source/core/dom/node.js =================================================================== --- /CKEditor/trunk/_source/core/dom/node.js (revision 3050) +++ /CKEditor/trunk/_source/core/dom/node.js (revision 3051) @@ -306,4 +306,24 @@ }, + getCommonAncestor : function( node ) + { + if ( node.equals( this ) ) + return this; + + if ( node.contains && node.contains( this ) ) + return node; + + var start = this.contains ? this : this.getParent(); + + do + { + if ( start.contains( node ) ) + return start; + } + while ( ( start = start.getParent() ) ); + + return null; + }, + getPosition : function( otherNode ) { Index: /CKEditor/trunk/_source/core/dom/range.js =================================================================== --- /CKEditor/trunk/_source/core/dom/range.js (revision 3050) +++ /CKEditor/trunk/_source/core/dom/range.js (revision 3051) @@ -491,18 +491,5 @@ } - if ( end.type == CKEDITOR.NODE_ELEMENT && end.contains( start ) ) - return end; - - if ( start.type != CKEDITOR.NODE_ELEMENT ) - start = start.getParent(); - - do - { - if ( start.contains( end ) ) - return start; - } - while( ( start = start.getParent() ) ) - - return null; + return start.getCommonAncestor( end ); }, Index: /CKEditor/trunk/_source/core/tools.js =================================================================== --- /CKEditor/trunk/_source/core/tools.js (revision 3050) +++ /CKEditor/trunk/_source/core/tools.js (revision 3051) @@ -311,4 +311,9 @@ } return -1; + }, + + bind : function( func, obj ) + { + return function() { return func.apply( obj, arguments ); }; } }; Index: /CKEditor/trunk/_source/lang/en.js =================================================================== --- /CKEditor/trunk/_source/lang/en.js (revision 3050) +++ /CKEditor/trunk/_source/lang/en.js (revision 3051) @@ -374,4 +374,7 @@ { eleTitle : '%1 element' - } + }, + + numberedlist : 'Insert/Remove Numbered List', + bulletedlist : 'Insert/Remove Bulleted List' }; Index: /CKEditor/trunk/_source/plugins/list/plugin.js =================================================================== --- /CKEditor/trunk/_source/plugins/list/plugin.js (revision 3051) +++ /CKEditor/trunk/_source/plugins/list/plugin.js (revision 3051) @@ -0,0 +1,540 @@ +/* +Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved. +For licensing, see LICENSE.html or http://ckeditor.com/license +*/ + +/** + * @file Insert and remove numbered and bulleted lists. + */ + +(function() +{ + var listNodeNames = { ol : 1, ul : 1 }, + emptyTextRegex = /^[\n\r\t ]*$/; + + CKEDITOR.plugins.list = { + /* + * Convert a DOM list tree into a data structure that is easier to + * manipulate. This operation should be non-intrusive in the sense that it + * does not change the DOM tree, with the exception that it may add some + * markers to the list item nodes when database is specified. + */ + listToArray : function( listNode, database, baseArray, baseIndentLevel, grandparentNode ) + { + if ( !listNodeNames[ listNode.getName() ] ) + return []; + + if ( !baseIndentLevel ) + baseIndentLevel = 0; + if ( !baseArray ) + baseArray = []; + + // Iterate over all list items to get their contents and look for inner lists. + for ( var i = 0, count = listNode.getChildCount() ; i < count ; i++ ) + { + var listItem = listNode.getChild( i ); + + // It may be a text node or some funny stuff. + if ( listItem.$.nodeName.toLowerCase() != 'li' ) + continue; + var itemObj = { 'parent' : listNode, indent : baseIndentLevel, contents : [] }; + if ( !grandparentNode ) + { + itemObj.grandparent = listNode.getParent(); + if ( itemObj.grandparent && itemObj.grandparent.$.nodeName.toLowerCase() == 'li' ) + itemObj.grandparent = itemObj.grandparent.getParent(); + } + else + itemObj.grandparent = grandparentNode; + + if ( database ) + CKEDITOR.dom.element.setMarker( database, listItem, 'listarray_index', baseArray.length ); + baseArray.push( itemObj ); + + for ( var j = 0, itemChildCount = listItem.getChildCount() ; j < itemChildCount ; j++ ) + { + var child = listItem.getChild( j ); + if ( child.type == CKEDITOR.NODE_ELEMENT && listNodeNames[ child.getName() ] ) + // Note the recursion here, it pushes inner list items with + // +1 indentation in the correct order. + CKEDITOR.plugins.list.listToArray( child, database, baseArray, baseIndentLevel + 1, itemObj.grandparent ); + else + itemObj.contents.push( child ); + } + } + return baseArray; + }, + + // Convert our internal representation of a list back to a DOM forest. + arrayToList : function( listArray, database, baseIndex, paragraphMode ) + { + if ( !baseIndex ) + baseIndex = 0; + if ( !listArray || listArray.length < baseIndex + 1 ) + return null; + var doc = listArray[ baseIndex ].parent.getDocument(), + retval = new CKEDITOR.dom.documentFragment( doc ), + rootNode = null, + currentIndex = baseIndex, + indentLevel = Math.max( listArray[ baseIndex ].indent, 0 ), + currentListItem = null; + while ( true ) + { + var item = listArray[ currentIndex ]; + if ( item.indent == indentLevel ) + { + if ( !rootNode || listArray[ currentIndex ].parent.getName() != rootNode.getName() ) + { + rootNode = listArray[ currentIndex ].parent.clone( false ); + retval.append( rootNode ); + } + currentListItem = rootNode.append( doc.createElement( 'li' ) ); + for ( var i = 0 ; i < item.contents.length ; i++ ) + currentListItem.append( item.contents[i].clone( true ) ); + currentIndex++; + } + else if ( item.indent == Math.max( indentLevel, 0 ) + 1 ) + { + var listData = CKEDITOR.plugins.list.arrayToList( listArray, null, currentIndex, paragraphMode ); + currentListItem.append( listData.listNode ); + currentIndex = listData.nextIndex; + } + else if ( item.indent == -1 && baseIndex == 0 && item.grandparent ) + { + var currentListItem; + if ( listNodeNames[ item.grandparent.getName() ] ) + currentListItem = doc.createElement( 'li' ); + else + { + if ( paragraphMode != 'br' && item.grandparent.getName() != 'td' ) + currentListItem = doc.createElement( paragraphMode ); + else + currentListItem = new CKEDITOR.dom.documentFragment( doc ); + } + + for ( var i = 0 ; i < item.contents.length ; i++ ) + currentListItem.append( item.contents[i].clone( true ) ); + + if ( currentListItem.type == CKEDITOR.NODE_DOCUMENT_FRAGMENT ) + { + if ( currentListItem.getLast() + && currentListItem.getLast().type == CKEDITOR.NODE_ELEMENT + && currentListItem.getLast().getAttribute( 'type' ) == '_moz' ) + currentListItem.getLast().remove(); + currentListItem.append( doc.createElement( 'br' ) ); + } + + if ( currentListItem.getName() == paragraphMode && currentListItem.$.firstChild ) + { + currentListItem.trim(); + var firstChild = currentListItem.getFirst(); + if ( firstChild.type == CKEDITOR.NODE_ELEMENT && firstChild.isBlockBoundary() ) + { + var tmp = new CKEDITOR.dom.documentFragment( doc ); + currentListItem.moveChildren( tmp ); + currentListItem = tmp; + } + } + + var currentListItemName = currentListItem.$.nodeName.toLowerCase(); + if ( !CKEDITOR.env.ie && currentListItemName == 'div' || currentListItemName == 'p' ) + currentListItem.append( doc.createElement( 'br' ) ); + retval.append( currentListItem ); + rootNode = null; + currentIndex++; + } + else + return null; + + if ( listArray.length <= currentIndex || Math.max( listArray[ currentIndex ].indent, 0 ) < indentLevel ) + break; + } + + // Clear marker attributes for the new list tree made of cloned nodes, if any. + if ( database ) + { + var currentNode = retval.getFirst(); + while ( currentNode ) + { + if ( currentNode.type == CKEDITOR.NODE_ELEMENT ) + CKEDITOR.dom.element.clearMarkers( database, currentNode ); + currentNode = currentNode.getNextSourceNode(); + } + } + + return { listNode : retval, nextIndex : currentIndex }; + } + }; + + function setState( editor, state ) + { + var command = editor.getCommand( this.name ); + command.state = state; + command.fire( 'state' ); + } + + function onSelectionChange( evt ) + { + var elements = evt.data.path.elements; + + for ( var i = 0 ; i < elements.length ; i++ ) + { + if ( listNodeNames[ elements[i].getName() ] ) + return setState.call( this, evt.editor, + this.type == elements[i].getName() ? CKEDITOR.TRISTATE_ON : CKEDITOR.TRISTATE_OFF ); + } + + setState.call( this, evt.editor, CKEDITOR.TRISTATE_OFF ); + } + + function changeListType( editor, groupObj, database, listsCreated ) + { + // This case is easy... + // 1. Convert the whole list into a one-dimensional array. + // 2. Change the list type by modifying the array. + // 3. Recreate the whole list by converting the array to a list. + // 4. Replace the original list with the recreated list. + var listArray = CKEDITOR.plugins.list.listToArray( groupObj.root, database ), + selectedListItems = []; + + for ( var i = 0 ; i < groupObj.contents.length ; i++ ) + { + var itemNode = groupObj.contents[i]; + itemNode = itemNode.getAscendant( 'li', true ); + if ( !itemNode || itemNode.getCustomData( 'list_item_processed' ) ) + continue; + selectedListItems.push( itemNode ); + CKEDITOR.dom.element.setMarker( database, itemNode, 'list_item_processed', true ); + } + + var fakeParent = groupObj.root.getDocument().createElement( this.type ); + for ( var i = 0 ; i < selectedListItems.length ; i++ ) + { + var listIndex = selectedListItems[i].getCustomData( 'listarray_index' ); + listArray[listIndex].parent = fakeParent; + } + var newList = CKEDITOR.plugins.list.arrayToList( listArray, database, null, editor.config.enterMode ); + for ( var i = 0, length = newList.listNode.getChildCount(), child ; + i < length && ( child = newList.listNode.getChild( i ) ) ; i++ ) + { + if ( child.getName() == this.type ) + listsCreated.push( child ); + } + newList.listNode.replace( groupObj.root ); + } + + function createList( editor, groupObj, listsCreated ) + { + var contents = groupObj.contents, + doc = groupObj.root.getDocument(), + listContents = []; + + // It is possible to have the contents returned by DomRangeIterator to be the same as the root. + // e.g. when we're running into table cells. + // In such a case, enclose the childNodes of contents[0] into a
. + if ( contents.length == 1 && contents[0].equals( groupObj.root ) ) + { + var divBlock = doc.createElement( 'div' ); + contents[0].moveChildren && contents[0].moveChildren( divBlock ); + contents[0].append( divBlock ); + contents[0] = divBlock; + } + + // Calculate the common parent node of all content blocks. + var commonParent = groupObj.contents[0].getParent(); + for ( var i = 0 ; i < contents.length ; i++ ) + commonParent = commonParent.getCommonAncestor( contents[i].getParent() ); + + // We want to insert things that are in the same tree level only, so calculate the contents again + // by expanding the selected blocks to the same tree level. + for ( var i = 0 ; i < contents.length ; i++ ) + { + var contentNode = contents[i], + parentNode; + while ( ( parentNode = contentNode.getParent() ) ) + { + if ( parentNode.equals( commonParent ) ) + { + listContents.push( contentNode ); + break; + } + contentNode = parentNode; + } + } + + if ( listContents.length < 1 ) + return; + + // Insert the list to the DOM tree. + var insertAnchor = listContents[ listContents.length - 1 ].getNext(), + listNode = doc.createElement( this.type ); + + listsCreated.push( listNode ); + while ( listContents.length ) + { + var contentBlock = listContents.shift(), + listItem = doc.createElement( 'li' ); + contentBlock.moveChildren( listItem ); + contentBlock.remove(); + listItem.appendTo( listNode ); + } + if ( insertAnchor ) + listNode.insertBefore( insertAnchor ); + else + listNode.appendTo( commonParent ); + } + + function removeList( editor, groupObj, database ) + { + // This is very much like the change list type operation. + // Except that we're changing the selected items' indent to -1 in the list array. + var listArray = CKEDITOR.plugins.list.listToArray( groupObj.root, database ), + selectedListItems = []; + + for ( var i = 0 ; i < groupObj.contents.length ; i++ ) + { + var itemNode = groupObj.contents[i]; + itemNode = itemNode.getAscendant( 'li', true ); + if ( !itemNode || itemNode.getCustomData( 'list_item_processed' ) ) + continue; + selectedListItems.push( itemNode ); + CKEDITOR.dom.element.setMarker( database, itemNode, 'list_item_processed', true ); + } + + var lastListIndex = null; + for ( var i = 0 ; i < selectedListItems.length ; i++ ) + { + var listIndex = selectedListItems[i].getCustomData( 'listarray_index' ); + listArray[listIndex].indent = -1; + lastListIndex = listIndex; + } + + // After cutting parts of the list out with indent=-1, we still have to maintain the array list + // model's nextItem.indent <= currentItem.indent + 1 invariant. Otherwise the array model of the + // list cannot be converted back to a real DOM list. + for ( var i = lastListIndex + 1 ; i < listArray.length ; i++ ) + { + if ( listArray[i].indent > listArray[i-1].indent + 1 ) + { + var indentOffset = listArray[i-1].indent + 1 - listArray[i].indent; + var oldIndent = listArray[i].indent; + while ( listArray[i] && listArray[i].indent >= oldIndent ) + { + listArray[i].indent += indentOffset; + i++; + } + i--; + } + } + + var newList = CKEDITOR.plugins.list.arrayToList( listArray, database, null, editor.config.enterMode ); + // If groupObj.root is the last element in its parent, or its nextSibling is a
, then we should + // not add a
after the final item. So, check for the cases and trim the
. + if ( groupObj.root.getNext() == null || groupObj.root.getNext().$.nodeName.toLowerCase() == 'br' ) + { + if ( newList.listNode.getLast().$.nodeName.toLowerCase() == 'br' ) + newList.listNode.getLast().remove(); + } + newList.listNode.replace( groupObj.root ); + } + + function listCommand( name, type ) + { + this.name = name; + this.type = type; + } + + listCommand.prototype = { + exec : function( editor ) + { + editor.focus(); + + var doc = editor.document, + selection = editor.getSelection(), + ranges = selection && selection.getRanges(); + + // There should be at least one selected range. + if ( !ranges || ranges.length < 1 ) + return; + + // Midas lists rule #1 says we can create a list even in an empty document. + // But DOM iterator wouldn't run if the document is really empty. + // So create a paragraph if the document is empty and we're going to create a list. + if ( this.state == CKEDITOR.TRISTATE_OFF ) + { + var body = doc.getBody(); + body.trim(); + if ( !body.getFirst() ) + { + var paragraph = doc.createElement( editor.config.enterMode ); + paragraph.appendTo( body ); + ranges = [ new CKEDITOR.dom.range( doc ) ]; + ranges[0].selectNodeContents( paragraph ); + selection.selectRanges( ranges ); + } + } + + var bookmarks = selection.createBookmarks(); + + // Group the blocks up because there are many cases where multiple lists have to be created, + // or multiple lists have to be cancelled. + var listGroups = [], + database = {}; + + while ( ranges.length > 0 ) + { + var range = ranges.shift(), + boundaryNodes = range.getBoundaryNodes(), + startNode = boundaryNodes.startNode, + endNode = boundaryNodes.endNode; + if ( startNode.type == CKEDITOR.NODE_ELEMENT && startNode.getName() == 'td' ) + range.setStartAt( boundaryNodes.startNode, CKEDITOR.POSITION_AFTER_START ); + if ( endNode.type == CKEDITOR.NODE_ELEMENT && endNode.getName() == 'td' ) + range.setEndAt( boundaryNodes.endNode, CKEDITOR.POSITION_BEFORE_END ); + + var iterator = range.createIterator(), + block; + iterator.forceBrBreak = ( this.state == CKEDITOR.TRISTATE_OFF ); + + while ( ( block = iterator.getNextParagraph() ) ) + { + var path = new CKEDITOR.dom.elementPath( block ), + listNode = null, + processedFlag = false, + blockLimit = path.blockLimit; + + // First, try to group by a list ancestor. + for ( var i = 0 ; i < path.elements.length ; i++ ) + { + var element = path.elements[i]; + if ( listNodeNames[ element.getName() ] ) + { + // If we've encountered a list inside a block limit + // The last group object of the block limit element should + // no longer be valid. Since paragraphs after the list + // should belong to a different group of paragraphs before + // the list. (Bug #1309) + blockLimit.removeCustomData( 'list_group_object' ); + + var groupObj = element.getCustomData( 'list_group_object' ); + if ( groupObj ) + groupObj.contents.push( block ); + else + { + groupObj = { root : element, contents : [ block ] }; + listGroups.push( groupObj ); + CKEDITOR.dom.element.setMarker( database, element, 'list_group_object', groupObj ); + } + processedFlag = true; + break; + } + } + + if ( processedFlag ) + continue; + + // No list ancestor? Group by block limit. + var root = blockLimit; + if ( root.getCustomData( 'list_group_object' ) ) + root.getCustomData( 'list_group_object' ).contents.push( block ); + else + { + var groupObj = { root : root, contents : [ block ] }; + CKEDITOR.dom.element.setMarker( database, root, 'list_group_object', groupObj ); + listGroups.push( groupObj ); + } + } + } + + // Now we have two kinds of list groups, groups rooted at a list, and groups rooted at a block limit element. + // We either have to build lists or remove lists, for removing a list does not makes sense when we are looking + // at the group that's not rooted at lists. So we have three cases to handle. + var listsCreated = []; + while ( listGroups.length > 0 ) + { + var groupObj = listGroups.shift(); + if ( this.state == CKEDITOR.TRISTATE_OFF ) + { + if ( listNodeNames[ groupObj.root.getName() ] ) + changeListType.call( this, editor, groupObj, database, listsCreated ); + else + createList.call( this, editor, groupObj, listsCreated ); + } + else if ( this.state == CKEDITOR.TRISTATE_ON && listNodeNames[ groupObj.root.getName() ] ) + removeList.call( this, editor, groupObj, database ); + } + + // For all new lists created, merge adjacent, same type lists. + for ( var i = 0 ; i < listsCreated.length ; i++ ) + { + var listNode = listsCreated[i], + stopFlag = false, + currentNode = listNode; + + while ( !stopFlag ) + { + currentNode = currentNode.getNext(); + if ( currentNode && currentNode.type == CKEDITOR.NODE_TEXT && emptyTextRegex.test( currentNode.getText() ) ) + continue; + stopFlag = true; + } + + if ( currentNode && currentNode.getName() == this.type ) + { + currentNode.remove(); + currentNode.moveChildren( listNode ); + } + + stopFlag = false; + currentNode = listNode; + while ( !stopFlag ) + { + currentNode = currentNode.getNext(); + if ( currentNode && currentNode.type == CKEDITOR.NODE_TEXT && emptyTextRegex.test( currentNode.getText() ) ) + continue; + stopFlag = true; + } + if ( currentNode && currentNode.getName() == this.type ) + { + currentNode.remove(); + currentNode.moveChildren( listNode, true ); + } + } + + // Clean up, restore selection and update toolbar button states. + CKEDITOR.dom.element.clearAllMarkers( database ); + selection.selectBookmarks( bookmarks ); + editor.focus(); + } + }; + + CKEDITOR.plugins.add( 'list', + { + init : function( editor ) + { + // Register commands. + var numberedListCommand = new listCommand( 'numberedlist', 'ol' ), + bulletedListCommand = new listCommand( 'bulletedlist', 'ul' ); + editor.addCommand( 'numberedlist', numberedListCommand ); + editor.addCommand( 'bulletedlist', bulletedListCommand ); + + // Register the toolbar button. + editor.ui.addButton( 'NumberedList', + { + label : editor.lang.numberedlist, + command : 'numberedlist' + } ); + editor.ui.addButton( 'BulletedList', + { + label : editor.lang.bulletedlist, + command : 'bulletedlist' + } ); + + // Register the state changing handlers. + editor.on( 'selectionChange', CKEDITOR.tools.bind( onSelectionChange, numberedListCommand ) ); + editor.on( 'selectionChange', CKEDITOR.tools.bind( onSelectionChange, bulletedListCommand ) ); + }, + + requires : [ 'domiterator' ] + } ); +})(); Index: /CKEditor/trunk/_source/plugins/selection/plugin.js =================================================================== --- /CKEditor/trunk/_source/plugins/selection/plugin.js (revision 3050) +++ /CKEditor/trunk/_source/plugins/selection/plugin.js (revision 3051) @@ -111,90 +111,89 @@ } }); -})(); - -/** - * Gets the current selection from the editing area when in WYSIWYG mode. - * @returns {CKEDITOR.dom.selection} A selection object or null if not on - * WYSIWYG mode or no selection is available. - * @example - * var selection = CKEDITOR.instances.editor1.getSelection(); - * alert( selection.getType() ); - */ -CKEDITOR.editor.prototype.getSelection = function() -{ - var retval = this.document ? this.document.getSelection() : null; /** - * IE BUG: The selection's document may be a different document than the - * editor document. Return null if that's the case. + * Gets the current selection from the editing area when in WYSIWYG mode. + * @returns {CKEDITOR.dom.selection} A selection object or null if not on + * WYSIWYG mode or no selection is available. + * @example + * var selection = CKEDITOR.instances.editor1.getSelection(); + * alert( selection.getType() ); */ - if ( retval && CKEDITOR.env.ie ) - { - var range = retval.getNative().createRange(); - if ( !range ) - return null; - else if ( range.item ) - return range.item(0).ownerDocument == this.document.$ ? retval : null; - else - return range.parentElement().ownerDocument == this.document.$ ? retval : null; - } - return retval; -}; - -/** - * Gets the current selection from the document. - * @returns {CKEDITOR.dom.selection} A selection object. - * @example - * var selection = CKEDITOR.instances.editor1.document.getSelection(); - * alert( selection.getType() ); - */ -CKEDITOR.dom.document.prototype.getSelection = function() -{ - return new CKEDITOR.dom.selection( this ); -}; - -/** - * No selection. - * @constant - * @example - * if ( editor.getSelection().getType() == CKEDITOR.SELECTION_NONE ) - * alert( 'Nothing is selected' ); - */ -CKEDITOR.SELECTION_NONE = 1; - -/** - * Text or collapsed selection. - * @constant - * @example - * if ( editor.getSelection().getType() == CKEDITOR.SELECTION_TEXT ) - * alert( 'Text is selected' ); - */ -CKEDITOR.SELECTION_TEXT = 2; - -/** - * Element selection. - * @constant - * @example - * if ( editor.getSelection().getType() == CKEDITOR.SELECTION_ELEMENT ) - * alert( 'An element is selected' ); - */ -CKEDITOR.SELECTION_ELEMENT = 3; - -/** - * Manipulates the selection in a DOM document. - * @constructor - * @example - */ -CKEDITOR.dom.selection = function( document ) -{ - this.document = document; - this._ = - { - cache : {} + CKEDITOR.editor.prototype.getSelection = function() + { + var retval = this.document ? this.document.getSelection() : null; + + /** + * IE BUG: The selection's document may be a different document than the + * editor document. Return null if that's the case. + */ + if ( retval && CKEDITOR.env.ie ) + { + var range = retval.getNative().createRange(); + if ( !range ) + return null; + else if ( range.item ) + return range.item(0).ownerDocument == this.document.$ ? retval : null; + else + return range.parentElement().ownerDocument == this.document.$ ? retval : null; + } + + retval.onSelectionSet = CKEDITOR.tools.bind( checkSelectionChangeTimeout, this ); + return retval; }; -}; - -(function() -{ + + /** + * Gets the current selection from the document. + * @returns {CKEDITOR.dom.selection} A selection object. + * @example + * var selection = CKEDITOR.instances.editor1.document.getSelection(); + * alert( selection.getType() ); + */ + CKEDITOR.dom.document.prototype.getSelection = function() + { + return new CKEDITOR.dom.selection( this ); + }; + + /** + * No selection. + * @constant + * @example + * if ( editor.getSelection().getType() == CKEDITOR.SELECTION_NONE ) + * alert( 'Nothing is selected' ); + */ + CKEDITOR.SELECTION_NONE = 1; + + /** + * Text or collapsed selection. + * @constant + * @example + * if ( editor.getSelection().getType() == CKEDITOR.SELECTION_TEXT ) + * alert( 'Text is selected' ); + */ + CKEDITOR.SELECTION_TEXT = 2; + + /** + * Element selection. + * @constant + * @example + * if ( editor.getSelection().getType() == CKEDITOR.SELECTION_ELEMENT ) + * alert( 'An element is selected' ); + */ + CKEDITOR.SELECTION_ELEMENT = 3; + + /** + * Manipulates the selection in a DOM document. + * @constructor + * @example + */ + CKEDITOR.dom.selection = function( document ) + { + this.document = document; + this._ = + { + cache : {} + }; + }; + var styleObjectElements = { img:1,hr:1,li:1,table:1,tr:1,td:1,embed:1,object:1,ol:1,ul:1 }; @@ -579,4 +578,5 @@ range.select(); + this.onSelectionSet && this.onSelectionSet(); } : @@ -591,4 +591,5 @@ sel.removeAllRanges(); sel.addRange( range ); + this.onSelectionSet && this.onSelectionSet(); }, @@ -601,4 +602,5 @@ if ( ranges[ 0 ] ) ranges[ 0 ].select(); + this.onSelectionSet && this.onSelectionSet(); } : @@ -618,4 +620,5 @@ sel.addRange( nativeRange ); } + this.onSelectionSet && this.onSelectionSet(); }, Index: /CKEditor/trunk/_source/plugins/toolbar/plugin.js =================================================================== --- /CKEditor/trunk/_source/plugins/toolbar/plugin.js (revision 3050) +++ /CKEditor/trunk/_source/plugins/toolbar/plugin.js (revision 3051) @@ -210,4 +210,5 @@ 'NewPage', '-', 'Bold', 'Italic', 'Underline', 'Strike', '-', + 'NumberedList', 'BulletedList', '-', 'Subscript', 'Superscript', '-', 'SelectAll', 'RemoveFormat', '-', Index: /CKEditor/trunk/_source/skins/default/toolbar.css =================================================================== --- /CKEditor/trunk/_source/skins/default/toolbar.css (revision 3050) +++ /CKEditor/trunk/_source/skins/default/toolbar.css (revision 3051) @@ -306,2 +306,12 @@ background-position: 0 -880px; } + +.cke_skin_default a.cke_button_numberedlist .cke_icon +{ + background-position: 0 -400px; +} + +.cke_skin_default a.cke_button_bulletedlist .cke_icon +{ + background-position: 0 -416px; +}