Changeset 1218 for FCKeditor/trunk

Timestamp:

12/18/07 11:31:52 (5 years ago)

Author:

fredck

Message:

Fixed #1603 : Certain specific markup was making FCKeditor entering in a loop, blocking its execution. Now, div elements are considered block elements only if they are not "containers", containing other block elements.

Location:

FCKeditor/trunk

Files:

• _whatsnew.html (modified) (1 diff)
• editor/_source/classes/fckdomrangeiterator.js (modified) (2 diffs)
• editor/_source/classes/fckelementpath.js (modified) (2 diffs)

FCKeditor/trunk/_whatsnew.html

@@ -60 +60 @@
                 <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1643">#1643</a>] Resolved
                         several "strict warning" messages in Firefox when running FCKeditor.</li>
+                <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1603">#1603</a>] Certain
+                        specific markup was making FCKeditor entering in a loop, blocking its execution.</li>
         </ul>
         <p>

FCKeditor/trunk/editor/_source/classes/fckdomrangeiterator.js

@@ -126 +126 @@
                                         }
 
+                                        // The range must finish right before the boundary,
+                                        // including possibly skipped empty spaces. (#1603)
+                                        if ( range )
+                                                range.SetEnd( currentNode, 3, true ) ;
+
                                         closeRange = true ;
                                 }
@@ -182 +187 @@
 
                                         currentNode = parentNode ;
+                                        includeNode = true ;
                                         isLast = ( currentNode == lastNode ) ;
                                         continueFromSibling = true ;

FCKeditor/trunk/editor/_source/classes/fckelementpath.js

@@ -47 +47 @@
                                 if ( FCKListsLib.PathBlockLimitElements[ sElementName ] != null )
                                 {
-                                        // DIV is considered the Block, if no block is available (#525).
-                                        if ( !eBlock && sElementName == 'div' )
+                                        // DIV is considered the Block, if no block is available (#525)
+                                        // and if it doesn't contain other blocks.
+                                        if ( !eBlock && sElementName == 'div' && !FCKElementPath._CheckHasBlock( e ) )
                                                 eBlock = e ;
                                         else
@@ -68 +69 @@
 }
 
+/**
+ * Check if an element contains any block element.
+ */
+FCKElementPath._CheckHasBlock = function( element )
+{
+        var childNodes = element.childNodes ;
+        
+        for ( var i = 0, count = childNodes.length ; i < count ; i++ )
+        {
+                var child = childNodes[i] ;
+                
+                if ( child.nodeType == 1 && FCKListsLib.BlockElements[ child.nodeName.toLowerCase() ] )
+                        return true ;
+        }
+        
+        return false ;
+}