Changeset 2206 for FCKeditor/branches

Timestamp:

2008-07-11 12:08:10 (5 months ago)

Author:

martinkou

Message:

Fixed infinite loop with DIV container detection in IE.
Fixed the problem where StartNode may be located after EndNode in an FCKDomRange in IE.
Fixed invalid inline CSS text display in DIV container dialog in IE.

Location:

FCKeditor/branches/features/div_container/editor

Files:

• dialog/fck_div.html (modified) (1 diff)
• _source/classes/fckdomrange.js (modified) (1 diff)
• _source/internals/fckdomtools.js (modified) (1 diff)

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

@@ -138 +138 @@
                         GetE( 'txtId' ).value = target.id ;
                         GetE( 'txtLang' ).value = target.lang ;
-                        GetE( 'txtInlineStyle').value = target.getAttribute( 'style' ) ;
+                        GetE( 'txtInlineStyle').value = target.style.cssText ;
                         GetE( 'txtTitle' ).value = target.title ;
                         GetE( 'selLangDir').value = target.dir || GetNearestAncestorDirection( target ) ;

FCKeditor/branches/features/div_container/editor/_source/classes/fckdomrange.js

@@ -67 +67 @@
                         }
                         else if ( eEndNode.nodeType == 1 )
-                                eEndNode = eEndNode.childNodes[ innerRange.endOffset - 1 ] ;
+                        {
+                                if ( innerRange.endContainer != innerRange.startContainer || innerRange.endOffset != innerRange.startOffset )
+                                        eEndNode = eEndNode.childNodes[ innerRange.endOffset - 1 ] ;
+                                else
+                                        eEndNode = eEndNode.childNodes[ innerRange.endOffset ] ;
+                        }
 
                         this.EndNode                    = eEndNode ;

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

@@ -1032 +1032 @@
                 var endNode = range.EndNode ;
                 var currentNode = startNode ;
-                
+
                 if ( startNode == endNode )
                 {
-                        while ( endNode.lastChild )
+                        while ( endNode.nodeType == 1 && endNode.lastChild )
                                 endNode = endNode.lastChild ;
                         endNode = FCKDomTools.GetNextSourceElement( endNode ) ;
                 }
 
-                while ( currentNode != endNode && currentNode != endNode.parentNode )
+                while ( currentNode && currentNode != endNode && currentNode != endNode.parentNode )
                 {
                         var path = new FCKElementPath( currentNode ) ;
                         var blockLimit = path.BlockLimit ;
-                        if ( blockLimit && blockLimit.nodeName.IEquals( 'div' ) && currentBlocks.indexOf( blockLimit ) == -1 )
+                        if ( blockLimit && blockLimit.nodeName.IEquals( 'div' ) && currentBlocks.IndexOf( blockLimit ) == -1 )
                                 currentBlocks.push( blockLimit ) ;