Changeset 2208 for FCKeditor/branches

Timestamp:

2008-07-11 13:18:07 (5 months ago)

Author:

martinkou

Message:

Fixed the issue where cross-container selections can result in non-selected DIV containers to be modified by the DIV container dialog as well.

Files:

• FCKeditor/branches/features/div_container/editor/_source/internals/fckdomtools.js (modified) (1 diff)

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

@@ -1042 +1042 @@
                 while ( currentNode && currentNode != endNode )
                 {
-                        var path = new FCKElementPath( currentNode ) ;
-                        var blockLimit = path.BlockLimit ;
-                        if ( blockLimit && blockLimit.nodeName.IEquals( 'div' ) && currentBlocks.IndexOf( blockLimit ) == -1 )
-                                currentBlocks.push( blockLimit ) ;
+                        if ( currentNode.nodeType != 3 || !/^[ \t\n]*$/.test( currentNode.nodeValue ) )
+                        {
+                                var path = new FCKElementPath( currentNode ) ;
+                                var blockLimit = path.BlockLimit ;
+                                if ( blockLimit && blockLimit.nodeName.IEquals( 'div' ) && currentBlocks.IndexOf( blockLimit ) == -1 )
+                                        currentBlocks.push( blockLimit ) ;
+                        }
 
                         currentNode = FCKDomTools.GetNextSourceNode( currentNode ) ;