Changeset 1511

Timestamp:

02/14/08 11:51:07 (5 years ago)

Author:

fredck

Message:

Fixed #1717 : The editor was entering on looping on some specific cases when dealing with invalid source markup.

Location:

FCKeditor/trunk

Files:

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

FCKeditor/trunk/_whatsnew.html

@@ -91 +91 @@
                 <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1854">#1854</a>] Indentation now works inside
                         table cells.</li>
+                <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1717">#1717</a>] The editor
+                        was entering on looping on some specific cases when dealing with invalid source
+                        markup.</li>
         </ul>
         <p>

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

@@ -92 +92 @@
                 var currentNode = this._NextNode ;
                 var lastNode = this._LastNode ;
+
+                this._NextNode = null ;
 
                 while ( currentNode )
@@ -129 +131 @@
                                         // including possibly skipped empty spaces. (#1603)
                                         if ( range )
+                                        {
                                                 range.SetEnd( currentNode, 3, true ) ;
+
+                                                // The found boundary must be set as the next one at this
+                                                // point. (#1717)
+                                                if ( nodeName != 'br' ) 
+                                                        this._NextNode = currentNode ;
+                                        }
 
                                         closeRange = true ;
@@ -311 +320 @@
                 // above block can be removed or changed, so we can rely on it for the
                 // next interation.
-                this._NextNode = ( isLast || block == lastNode ) ? null : FCKDomTools.GetNextSourceNode( block, true, null, lastNode ) ;
+                if ( !this._NextNode )
+                        this._NextNode = ( isLast || block == lastNode ) ? null : FCKDomTools.GetNextSourceNode( block, true, null, lastNode ) ;
 
                 return block ;