Changeset 2204 for FCKeditor/branches

Timestamp:

2008-07-11 11:17:49 (5 months ago)

Author:

martinkou

Message:

Simplified the DIV container detection logic a bit.

Files:

• FCKeditor/branches/features/div_container/editor/_source/internals/fckdomtools.js (modified) (2 diffs)

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

@@ -1031 +1031 @@
                 var startNode = range.StartNode ;
                 var endNode = range.EndNode ;
-                var elementMarkers = {} ;
                 var currentNode = startNode ;
                 
@@ -1045 +1044 @@
                         var path = new FCKElementPath( currentNode ) ;
                         var blockLimit = path.BlockLimit ;
-                        if ( blockLimit && blockLimit.nodeName.IEquals( 'div' ) && !blockLimit['_fckdivincluded'] )
-                        {
+                        if ( blockLimit && blockLimit.nodeName.IEquals( 'div' ) && !blockLimit['_fckdivincluded'] &&
+                                        currentBlocks.indexOf( blockLimit ) == -1 )
                                 currentBlocks.push( blockLimit ) ;
-                                FCKDomTools.SetElementMarker( elementMarkers, blockLimit, '_fckdivincluded', true ) ;
-                        }
 
                         currentNode = FCKDomTools.GetNextSourceElement( currentNode ) ;
                 }
-
-                FCKDomTools.ClearAllMarkers( elementMarkers ) ;
 
                 return currentBlocks ;