Changeset 2200

Timestamp:

2008-07-09 07:17:53 (5 months ago)

Author:

martinkou

Message:

Improved div container detection logic to correctly account for multi-level selections.

Files:

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

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

@@ -1041 +1041 @@
                 do
                 {
-                        if ( currentNode.nodeName.IEquals( 'div' ) && currentNode.firstChild &&
-                                        FCKListsLib.BlockElements[ currentNode.firstChild.nodeName.toLowerCase() ] )
-                        {
+                        var child = currentNode.firstChild ;
+                        while ( child && child.nodeType != 1 )
+                                child = child.nextSibling ;
+
+                        if ( currentNode.nodeName.IEquals( 'div' ) && child &&
+                                        FCKListsLib.BlockElements[ child.nodeName.toLowerCase() ] )
+                        {
+                                // This is a block limit node.
                                 currentBlocks.push( currentNode ) ;
                                 if ( currentNode.parentNode.nodeName.IEquals( 'div' ) )
@@ -1049 +1054 @@
                                                         '_fckignorethisnode', true ) ;
                         }
+                        else
+                        {
+                                // This is not a block limit node.
+                                FCKDomTools.SetElementMarker( elementMarkers, currentNode.parentNode,
+                                                '_fckincludethisnode', true ) ;
+                        }
                 }
                 while ( ( currentNode = FCKDomTools.GetNextSourceElement( currentNode ) ) && currentNode != endNode
@@ -1055 +1066 @@
                 for ( var i = currentBlocks.length - 1 ; i >= 0 ; i-- )
                 {
-                        if ( currentBlocks[i]['_fckignorethisnode'] )
+                        if ( currentBlocks[i]['_fckignorethisnode'] && !currentBlocks[i]['_fckincludethisnode'] )
                                 currentBlocks.splice( i, 1 ) ;
                 }