Ticket #1603: 1603.patch

_whatsnew.html

@@ -57 +57 @@
                 <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/339">#339</a>] [<a
                         target="_blank" href="http://dev.fckeditor.net/ticket/681">#681</a>] The SpellerPages
                         spell checker will now completely ignore the presence of HTML tags in the text.</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>
                 <a href="_whatsnew_history.html">See previous versions history</a>

editor/_source/classes/fckdomrangeiterator.js

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

editor/_source/classes/fckelementpath.js

@@ -46 +46 @@
 
                                 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
                                                 eBlockLimit = e ;
@@ -67 +68 @@
         this.Elements = aElements ;
 }
 
-
+/**
+ * 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 ;
+}
+ No newline at end of file