Changeset 2199

Timestamp:

2008-07-09 06:54:25 (6 months ago)

Author:

martinkou

Message:

Made the remove div container menu item to be able to remove multiple div containers.

Location:

FCKeditor/branches/features/div_container/editor

Files:

• dialog/fck_div.html (modified) (1 diff)
• _source/commandclasses/fck_othercommands.js (modified) (2 diffs)
• _source/internals/fck_contextmenu.js (modified) (1 diff)
• _source/internals/fckdomtools.js (modified) (1 diff)

FCKeditor/branches/features/div_container/editor/dialog/fck_div.html

@@ -64 +64 @@
 {
         dialog.Selection.EnsureSelection() ;
-        var range = new FCKDomRange( FCK.EditorWindow ) ;
-        range.MoveToSelection() ;
-
-        var startNode = range.StartNode ;
-        var endNode = range.EndNode ;
-        var elementMarkers = {} ;
-
-        var startPath = new FCKElementPath( startNode ) ;
-        if ( startPath.BlockLimit && startPath.BlockLimit.nodeName.IEquals( 'div' ) )
-                startNode = startPath.BlockLimit ;
-        var currentNode = startNode ;
-
-        do
-        {
-                if ( currentNode.nodeName.IEquals( 'div' ) && currentNode.firstChild &&
-                                FCKListsLib.BlockElements[ currentNode.firstChild.nodeName.toLowerCase() ] )
-                {
-                        CurrentContainers.push( currentNode ) ;
-                        if ( currentNode.parentNode.nodeName.IEquals( 'div' ) )
-                                FCKDomTools.SetElementMarker( elementMarkers, currentNode.parentNode,
-                                                '_fckignorethisnode', true ) ;
-                }
-        }
-        while ( ( currentNode = FCKDomTools.GetNextSourceElement( currentNode ) ) && currentNode != endNode
-                        && currentNode != endNode.parentNode ) ;
-
-        for ( var i = CurrentContainers.length - 1 ; i >= 0 ; i-- )
-        {
-                if ( CurrentContainers[i]['_fckignorethisnode'] )
-                        CurrentContainers.splice( i, 1 ) ;
-        }
-
-        FCKDomTools.ClearAllMarkers( elementMarkers ) ;
+        CurrentContainers = FCKDomTools.GetSelectedDivContainers() ;
 }
 

FCKeditor/branches/features/div_container/editor/_source/commandclasses/fck_othercommands.js

@@ -538 +538 @@
                 FCKUndo.SaveUndoStep() ;
 
-                // Find out the node to delete.
-                var node = FCKSelection.GetParentElement() ;
-                var path = new FCKElementPath( node ) ;
-                node = path.BlockLimit ;
+                // Find out the nodes to delete.
+                var nodes = FCKDomTools.GetSelectedDivContainers() ;
                 
                 // Remember the current selection position.
@@ -549 +547 @@
 
                 // Delete the container DIV node.
-                FCKDomTools.RemoveNode( node, true ) ;
+                for ( var i = 0 ; i < nodes.length ; i++)
+                        FCKDomTools.RemoveNode( nodes[i], true ) ;
 
                 // Restore selection.

FCKeditor/branches/features/div_container/editor/_source/internals/fck_contextmenu.js

@@ -298 +298 @@
                         AddItems : function( menu, tag, tagName )
                         {
-                                var currentBlocks = [] ;
-                                var range = new FCKDomRange( FCK.EditorWindow ) ;
-                                range.MoveToSelection() ;
-
-                                var startNode = range.StartNode ;
-                                var endNode = range.EndNode ;
-                                var elementMarkers = {} ;
-
-                                var startPath = new FCKElementPath( startNode ) ;
-                                if ( startPath.BlockLimit && startPath.BlockLimit.nodeName.IEquals( 'div' ) )
-                                        startNode = startPath.BlockLimit ;
-                                var currentNode = startNode ;
-
-                                do
-                                {
-                                        if ( currentNode.nodeName.IEquals( 'div' ) && currentNode.firstChild &&
-                                                        FCKListsLib.BlockElements[ currentNode.firstChild.nodeName.toLowerCase() ] )
-                                        {
-                                                currentBlocks.push( currentNode ) ;
-                                                if ( currentNode.parentNode.nodeName.IEquals( 'div' ) )
-                                                        FCKDomTools.SetElementMarker( elementMarkers, currentNode.parentNode,
-                                                                        '_fckignorethisnode', true ) ;
-                                        }
-                                }
-                                while ( ( currentNode = FCKDomTools.GetNextSourceElement( currentNode ) ) && currentNode != endNode
-                                                && currentNode != endNode.parentNode ) ;
-
-                                for ( var i = currentBlocks.length - 1 ; i >= 0 ; i-- )
-                                {
-                                        if ( currentBlocks[i]['_fckignorethisnode'] )
-                                                currentBlocks.splice( i, 1 ) ;
-                                }
-
-                                FCKDomTools.ClearAllMarkers( elementMarkers ) ;
+                                var currentBlocks = FCKDomTools.GetSelectedDivContainers() ;
 
                                 if ( currentBlocks.length > 0 )

FCKeditor/branches/features/div_container/editor/_source/internals/fckdomtools.js

@@ -1022 +1022 @@
                 // In the DTD # == text node.
                 return ( childDTD['#'] && !FCKListsLib.NonEditableElements[ nodeName ] ) ;
+        },
+
+        GetSelectedDivContainers : function()
+        {
+                var currentBlocks = [] ;
+                var range = new FCKDomRange( FCK.EditorWindow ) ;
+                range.MoveToSelection() ;
+
+                var startNode = range.StartNode ;
+                var endNode = range.EndNode ;
+                var elementMarkers = {} ;
+
+                var startPath = new FCKElementPath( startNode ) ;
+                if ( startPath.BlockLimit && startPath.BlockLimit.nodeName.IEquals( 'div' ) )
+                        startNode = startPath.BlockLimit ;
+                var currentNode = startNode ;
+
+                do
+                {
+                        if ( currentNode.nodeName.IEquals( 'div' ) && currentNode.firstChild &&
+                                        FCKListsLib.BlockElements[ currentNode.firstChild.nodeName.toLowerCase() ] )
+                        {
+                                currentBlocks.push( currentNode ) ;
+                                if ( currentNode.parentNode.nodeName.IEquals( 'div' ) )
+                                        FCKDomTools.SetElementMarker( elementMarkers, currentNode.parentNode,
+                                                        '_fckignorethisnode', true ) ;
+                        }
+                }
+                while ( ( currentNode = FCKDomTools.GetNextSourceElement( currentNode ) ) && currentNode != endNode
+                                && currentNode != endNode.parentNode ) ;
+
+                for ( var i = currentBlocks.length - 1 ; i >= 0 ; i-- )
+                {
+                        if ( currentBlocks[i]['_fckignorethisnode'] )
+                                currentBlocks.splice( i, 1 ) ;
+                }
+
+                FCKDomTools.ClearAllMarkers( elementMarkers ) ;
+
+                return currentBlocks ;
         }
 } ;