Changeset 869

Timestamp:

2007-09-24 13:06:59 (14 months ago)

Author:

martinkou

Message:

Fix for #1178 and #1267 : Reimplemented the insert list/remove lists command from scratch without depending on buggy browser commands.

Location:

FCKeditor/trunk/editor/_source

Files:

• commandclasses/fckindentcommands.js (modified) (1 diff)
• commandclasses/fcklistcommands.js (modified) (2 diffs)
• internals/fckcommands.js (modified) (1 diff)
• internals/fckdomtools.js (modified) (4 diffs)

FCKeditor/trunk/editor/_source/commandclasses/fckindentcommands.js

@@ -229 +229 @@
 
                 // Convert the list DOM tree into a one dimensional array.
-                var listArray = FCKDomTools.ListToArray( listNode, null, null, markerObj ) ;
+                var listArray = FCKDomTools.ListToArray( listNode, markerObj ) ;
 
                 // Apply indenting or outdenting on the array.

FCKeditor/trunk/editor/_source/commandclasses/fcklistcommands.js

@@ -22 +22 @@
  */
 
-var FCKListCommand = function( name )
+var FCKListCommand = function( name, tagName )
 {
         this.Name = name ;
+        this.TagName = tagName ;
 }
 
@@ -31 +32 @@
         GetState : function()
         {
-                return FCK.GetNamedCommandState( this.Name ) ;
+                // Disabled if not WYSIWYG.
+                if ( FCK.EditMode != FCK_EDITMODE_WYSIWYG || ! FCK.EditorWindow )
+                        return FCK_TRISTATE_DISABLED ;
+
+                // We'll use the style system's convention to determine list state here...
+                // If the starting block is a descendant of an <ol> or <ul> node, then we're in a list.
+                var startContainer = FCKSelection.GetBoundaryParentElement( true ) ;
+                var listNode = FCKTools.GetElementAscensor( startContainer, this.TagName ) ;
+                if ( listNode )
+                        return FCK_TRISTATE_ON ;
+                else
+                        return FCK_TRISTATE_OFF ;
         },
 
         Execute : function()
         {
-                if ( FCKBrowserInfo.IsIE && this.GetState() == FCK_TRISTATE_OFF )
-                {
-                        // IE does not split selected <br> tags when it is making lists. (See #428)
-                        // So, pre-split the blocks for IE.
-                        var range = new FCKDomRange( FCK.EditorWindow ) ;
-                        range.MoveToSelection() ;
-                        var startNode = range._Range.startContainer ;
-                        var endNode = range._Range.endContainer ;
-                        if ( startNode.nodeType == 1 )
-                        {
-                                if ( startNode.firstChild )
-                                {
-                                        if ( startNode.childNodes.length <= range._Range.startOffset )
-                                                startNode = startNode.lastChild ;
-                                        else
-                                                startNode = startNode.childNodes[ range._Range.startOffset ] ;
-                                }
-                        }
-                        if ( endNode.nodeType == 1 )
-                        {
-                                if ( endNode.firstChild )
-                                {
-                                        if ( endNode.childNodes.length <= range._Range.endOffset )
-                                                endNode = endNode.lastChild ;
-                                        else
-                                                endNode = endNode.childNodes[ range._Range.endOffset ] ;
-                                }
-                        }
-
-                        var brNodes = [] ;
-                        var curNode = startNode ;
-                        while ( curNode && curNode != endNode )
-                        {
-                                if ( curNode.nodeType == 1 && curNode.tagName.toLowerCase() == 'br' )
-                                        brNodes.push( curNode ) ;
-                                curNode = FCKTools.GetNextNode( curNode ) ;
-                        }
-
-                        for ( var i = brNodes.length - 1 ; i >= 0 ; i-- )
-                        {
-                                range.SetStart( brNodes[i], 3 ) ;
-                                range.SetEnd( brNodes[i], 3 ) ;
-                                brNodes[i].parentNode.removeChild( brNodes[i] ) ;
-                                range.SplitBlock() ;
-                        }
-
-                        range.SetStart( startNode, 1 ) ;
-                        range.SetEnd( endNode, 4 ) ;
-                        range.Select() ;
-                }
-                FCK.ExecuteNamedCommand( this.Name ) ;
+                FCKUndo.SaveUndoStep() ;
+
+                var range = new FCKDomRange( FCK.EditorWindow ) ;
+                range.MoveToSelection() ;
+                var bookmark = range.CreateBookmark() ;
+
+                // 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 = [] ;
+                var markerObj = {} ;
+                var iterator = new FCKDomRangeIterator( range ) ;
+                var block ;
+                var state = this.GetState() ;
+                iterator.ForceBrBreak = ( state == FCK_TRISTATE_OFF ) ;
+                var nextRangeExists = true ;
+                var rangeQueue = null ;
+                while ( nextRangeExists )
+                {
+                        while ( ( block = iterator.GetNextParagraph() ) )
+                        {
+                                var path = new FCKElementPath( block ) ;
+                                var listNode = null ;
+                                var processedFlag = false ;
+
+                                // First, try to group by a list ancestor.
+                                for ( var i = path.Elements.length - 1 ; i >= 0 ; i-- )
+                                {
+                                        var el = path.Elements[i] ;
+                                        if ( el.nodeName.IEquals( ['ol', 'ul'] ) )
+                                        {
+                                                var groupObj = el._FCK_ListGroupObject ;
+                                                if ( groupObj )
+                                                        groupObj.contents.push( block ) ;
+                                                else
+                                                {
+                                                        groupObj = { 'root' : el, 'contents' : [ block ] } ;
+                                                        listGroups.push( groupObj ) ;
+                                                        FCKDomTools.SetElementMarker( markerObj, el, '_FCK_ListGroupObject', groupObj ) ;
+                                                }
+                                                processedFlag = true ;
+                                                break ;
+                                        }
+                                }
+
+                                if ( processedFlag )
+                                        continue ;
+
+                                // No list ancestor? Group by block limit.
+                                var root = path.BlockLimit ;
+                                if ( root._FCK_ListGroupObject )
+                                        root._FCK_ListGroupObject.contents.push( block ) ;
+                                else
+                                {
+                                        var groupObj = { 'root' : root, 'contents' : [ block ] } ;
+                                        FCKDomTools.SetElementMarker( markerObj, root, '_FCK_ListGroupObject', groupObj ) ;
+                                        listGroups.push( groupObj ) ;
+                                }
+                        }
+
+                        if ( FCKBrowserInfo.IsIE )
+                                nextRangeExists = false ;
+                        else
+                        {
+                                if ( rangeQueue == null )
+                                {
+                                        rangeQueue = [] ;
+                                        var selectionObject = FCK.EditorWindow.getSelection() ;
+                                        if ( selectionObject && listGroups.length == 0 )
+                                                rangeQueue.push( selectionObject.getRangeAt( 0 ) ) ;
+                                        for ( var i = 1 ; selectionObject && i < selectionObject.rangeCount ; i++ )
+                                                rangeQueue.push( selectionObject.getRangeAt( i ) ) ;
+                                }
+                                if ( rangeQueue.length < 1 )
+                                        nextRangeExists = false ;
+                                else
+                                {
+                                        var internalRange = FCKW3CRange.CreateFromRange( FCK.EditorDocument, rangeQueue.shift() ) ;
+                                        range._Range = internalRange ;
+                                        range._UpdateElementInfo() ;
+                                        if ( range.StartNode.nodeName.IEquals( 'td' ) )
+                                                range.SetStart( range.StartNode, 1 ) ;
+                                        if ( range.EndNode.nodeName.IEquals( 'td' ) )
+                                                range.SetEnd( range.EndNode, 2 ) ;
+                                        iterator = new FCKDomRangeIterator( range ) ;
+                                        iterator.ForceBrBreak = ( state == FCK_TRISTATE_OFF ) ;
+                                }
+                        }
+                }
+
+                // 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 ( state == FCK_TRISTATE_OFF )
+                        {
+                                if ( groupObj.root.nodeName.IEquals( ['ul', 'ol'] ) )
+                                        this._ChangeListType( groupObj, markerObj, listsCreated ) ;
+                                else
+                                        this._CreateList( groupObj, listsCreated ) ;
+                        }
+                        else if ( state == FCK_TRISTATE_ON && groupObj.root.nodeName.IEquals( ['ul', 'ol'] ) )
+                                this._RemoveList( groupObj, markerObj ) ;
+                }
+
+                // For all new lists created, merge adjacent, same type lists.
+                while ( listsCreated.length > 0 )
+                {
+                        var listNode = listsCreated.shift() ;
+                        var stopFlag = false ;
+                        var currentNode = listNode ;
+                        while ( ! stopFlag )
+                        {
+                                currentNode = currentNode.nextSibling ;
+                                if ( currentNode && currentNode.nodeType == 3 && currentNode.nodeValue.search( /^[\n\r\t ]*$/ ) == 0  )
+                                        continue ;
+                                stopFlag = true ;
+                        }
+                        
+                        if ( currentNode && currentNode.nodeName.IEquals( this.TagName ) )
+                        {
+                                currentNode.parentNode.removeChild( currentNode ) ;
+                                while ( currentNode.firstChild )
+                                        listNode.appendChild( currentNode.removeChild( currentNode.firstChild ) ) ;
+                        }
+                }
+
+                // Clean up, restore selection and update toolbar button states.
+                FCKDomTools.ClearElementMarkers( markerObj ) ;
+                range.MoveToBookmark( bookmark ) ;
+                range.Select() ;
+                FCK.Events.FireEvent( 'OnSelectionChange' ) ;
+        },
+
+        _ChangeListType : function( groupObj, markerObj, 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 = FCKDomTools.ListToArray( groupObj.root, markerObj ) ;
+                var selectedListItems = [] ;
+                for ( var i = 0 ; i < groupObj.contents.length ; i++ )
+                {
+                        var itemNode = groupObj.contents[i] ;
+                        itemNode = FCKTools.GetElementAscensor( itemNode, 'li' ) ;
+                        if ( ! itemNode || itemNode._FCK_ListItem_Processed )
+                                continue ;
+                        selectedListItems.push( itemNode ) ;
+                        FCKDomTools.SetElementMarker( markerObj, itemNode, '_FCK_ListItem_Processed', true ) ;
+                }
+                var fakeParent = groupObj.root.ownerDocument.createElement( this.TagName ) ;
+                for ( var i = 0 ; i < selectedListItems.length ; i++ )
+                {
+                        var listIndex = selectedListItems[i]._FCK_ListArray_Index ;
+                        listArray[listIndex].parent = fakeParent ;
+                }
+                var newList = FCKDomTools.ArrayToList( listArray ) ;
+                if ( newList.listNode.lastChild.nodeName.IEquals( this.TagName) )
+                        listsCreated.push( newList.listNode.lastChild ) ;
+                groupObj.root.parentNode.replaceChild( newList.listNode, groupObj.root ) ;
+        },
+
+        _CreateList : function( groupObj, listsCreated )
+        {
+                var contents = groupObj.contents ;
+                var doc = groupObj.root.ownerDocument ;
+                var 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 <div>.
+                if ( contents.length == 1 && contents[0] == groupObj.root )
+                {
+                        var divBlock = doc.createElement( 'div' ); 
+                        while ( contents[0].firstChild )
+                                divBlock.appendChild( contents[0].removeChild( contents[0].firstChild ) ) ;
+                        contents[0].appendChild( divBlock ) ;
+                        contents[0] = divBlock ;
+                }
+
+                // Calculate the common parent node of all content blocks.
+                var commonParent = groupObj.contents[0].parentNode ;
+                for ( var i = 0 ; i < contents.length ; i++ )
+                        commonParent = FCKDomTools.GetCommonParents( commonParent, contents[i].parentNode ).pop() ;
+
+                // 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] ;
+                        while ( contentNode.parentNode )
+                        { 
+                                if ( contentNode.parentNode == commonParent )
+                                {
+                                        listContents.push( contentNode ) ;
+                                        break ;
+                                }
+                                contentNode = contentNode.parentNode ;
+                        }
+                }
+
+                if ( listContents.length < 1 )
+                        return ;
+
+                // Insert the list to the DOM tree.
+                var insertAnchor = listContents[listContents.length - 1].nextSibling ;
+                var listNode = doc.createElement( this.TagName ) ;
+                listsCreated.push( listNode ) ;
+                while ( listContents.length )
+                {
+                        var contentBlock = listContents.shift() ;
+                        var docFrag = doc.createDocumentFragment() ;
+                        while ( contentBlock.firstChild )
+                                docFrag.appendChild( contentBlock.removeChild( contentBlock.firstChild ) ) ;
+                        contentBlock.parentNode.removeChild( contentBlock ) ;
+                        var listItem = doc.createElement( 'li' ) ; 
+                        listItem.appendChild( docFrag ) ;
+                        listNode.appendChild( listItem ) ;
+                }
+                commonParent.insertBefore( listNode, insertAnchor ) ;
+        },
+
+        _RemoveList : function( groupObj, markerObj )
+        {
+                // 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 = FCKDomTools.ListToArray( groupObj.root, markerObj ) ;
+                var selectedListItems = [] ;
+                for ( var i = 0 ; i < groupObj.contents.length ; i++ )
+                {
+                        var itemNode = groupObj.contents[i] ;
+                        itemNode = FCKTools.GetElementAscensor( itemNode, 'li' ) ;
+                        if ( ! itemNode || itemNode._FCK_ListItem_Processed )
+                                continue ;
+                        selectedListItems.push( itemNode ) ;
+                        FCKDomTools.SetElementMarker( markerObj, itemNode, '_FCK_ListItem_Processed', true ) ;
+                }
+                
+                var lastListIndex = null ;
+                for ( var i = 0 ; i < selectedListItems.length ; i++ )
+                {
+                        var listIndex = selectedListItems[i]._FCK_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 = FCKDomTools.ArrayToList( listArray ) ;
+                // If groupObj.root is the last element in its parent, or its nextSibling is a <br>, then we should 
+                // not add a <br> after the final item. So, check for the cases and trim the <br>.
+                if ( groupObj.root.nextSibling == null || groupObj.root.nextSibling.nodeName.IEquals( 'br' ) )
+                {
+                        if ( newList.listNode.lastChild.nodeName.IEquals( 'br' ) )
+                                newList.listNode.removeChild( newList.listNode.lastChild ) ;
+                }
+                groupObj.root.parentNode.replaceChild( newList.listNode, groupObj.root ) ;
         }
 };

FCKeditor/trunk/editor/_source/internals/fckcommands.js

@@ -131 +131 @@
 
                 case 'SelectAll'                        : oCommand = new FCKSelectAllCommand() ; break ;
-                case 'InsertOrderedList'        : oCommand = new FCKListCommand( 'insertorderedlist' ) ; break ;
-                case 'InsertUnorderedList'      : oCommand = new FCKListCommand( 'insertunorderedlist' ) ; break ;
+                case 'InsertOrderedList'        : oCommand = new FCKListCommand( 'insertorderedlist', 'ol' ) ; break ;
+                case 'InsertUnorderedList'      : oCommand = new FCKListCommand( 'insertunorderedlist', 'ul' ) ; break ;
                 case 'ShowBlocks' : oCommand = new FCKShowBlockCommand( 'ShowBlocks', FCKConfig.StartupShowBlocks ? FCK_TRISTATE_ON : FCK_TRISTATE_OFF ) ; break ;
 

FCKeditor/trunk/editor/_source/internals/fckdomtools.js

@@ -610 +610 @@
         // 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 markerObj is specified.
-        ListToArray : function( listNode, baseArray, baseIndentLevel, markerObj )
+        ListToArray : function( listNode, markerObj, baseArray, baseIndentLevel, grandparentNode )
         {
                 if ( ! listNode.nodeName.IEquals( ['ul', 'ol'] ) )
@@ -625 +625 @@
                         if ( ! listItem.nodeName.IEquals( 'li' ) )
                                 continue ;
-                        var itemObj = { 'grandparent' : listNode.parentNode, 'parent' : listNode, 'indent' : baseIndentLevel, 'contents' : [] } ;
-                        if ( itemObj.grandparent && itemObj.grandparent.nodeName.IEquals( 'li' ) )
-                                itemObj.grandparent = itemObj.grandparent.parentNode ;
+                        var itemObj = { 'parent' : listNode, 'indent' : baseIndentLevel, 'contents' : [] } ;
+                        if ( ! grandparentNode )
+                        {
+                                itemObj.grandparent = listNode.parentNode ;
+                                if ( itemObj.grandparent && itemObj.grandparent.nodeName.IEquals( 'li' ) )
+                                        itemObj.grandparent = itemObj.grandparent.parentNode ;
+                        }
+                        else
+                                itemObj.grandparent = grandparentNode ;
                         if ( markerObj )
                                 this.SetElementMarker( markerObj, listItem, '_FCK_ListArray_Index', baseArray.length ) ;
@@ -637 +643 @@
                                         // Note the recursion here, it pushes inner list items with +1 indentation in the correct
                                         // order.
-                                        this.ListToArray( child, baseArray, baseIndentLevel + 1, markerObj ) ;
+                                        this.ListToArray( child, markerObj, baseArray, baseIndentLevel + 1, itemObj.grandparent ) ;
                                 else
                                         itemObj.contents.push( child ) ;
@@ -687 +693 @@
                                 else
                                 {
-                                        if ( FCKConfig.EnterMode.IEquals( ['div', 'p'] ) )
+                                        if ( FCKConfig.EnterMode.IEquals( ['div', 'p'] ) && ! item.grandparent.nodeName.IEquals( 'td' ) )
                                                 currentListItem = doc.createElement( FCKConfig.EnterMode ) ;
                                         else