Changeset 792

Timestamp:

09/07/07 14:07:05 (6 years ago)

Author:

martinkou

Message:

Tested the second part of FCKListCommands.Execute().

File:

• FCKeditor/branches/features/custom_list_command/editor/_source/commandclasses/fcklistcommands.js (modified) (4 diffs)

FCKeditor/branches/features/custom_list_command/editor/_source/commandclasses/fcklistcommands.js

@@ -83 +83 @@
                                                 FCKDomTools.SetNodeMarker( markerObj, unmarkedNodes[j], '_FCKDepthCounter', 
                                                                topDepth + 1 + j ) ;
-                                                markedNodes.push( unmarkedNodes[j] ) ;
                                         }
                                         if ( ancestor._FCKDepthCounter < shallowestNode._FCKDepthCounter )
@@ -103 +102 @@
                                 while ( currentNode != endNode )
                                 {
-                                        if ( currentNode._FCKDepthCounter > shallowest._FCKDepthCounter )
+                                        var nextNode = null ;
+                                        if ( currentNode.lastChild )
+                                                nextNode = FCKDomTools.GetNextSourceNode( currentNode.lastChild ) ;
+                                        else
+                                                nextNode = FCKDomTools.GetNextSourceNode( currentNode ) ;
+                                        if ( currentNode._FCKDepthCounter > shallowestNode._FCKDepthCounter )
                                         {
                                                 var ancestor = currentNode.parentNode ;
@@ -133 +137 @@
                                                 currentFragment.appendChild( currentNode ) ;
                                         }
-                                        currentNode = FCKDomTools.GetNextSourceNode( currentNode ) ;
+                                        currentNode = nextNode ;
                                 }
                         }
@@ -153 +157 @@
                         for ( var i = 0 ; i < itemDocFragments.length ; i++ )
                         {
-                                var previousParent = itemDocFragments.firstChild._FCKPreviousParent ;
+                                var previousParent = itemDocFragments[i].firstChild._FCKPreviousParent ;
                                 var ancestor = previousParent ;
                                 //while ( ancestor._FCKDepthCounter <= )