Changeset 826

Timestamp:

09/15/07 13:50:06 (6 years ago)

Author:

fredck

Message:

Fixed #1250 : There was a small bug in the FCKDomRangeIterator logic which was making it iterate out of the range boundaries.

File:

• FCKeditor/trunk/editor/_source/classes/fckdomrangeiterator.js (modified) (9 diffs)

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

@@ -37 +37 @@
          */
         this.ForceBrBreak = false ;
-        
+
         /**
          * Guarantees that the iterator will always return "real" block elements.
@@ -64 +64 @@
                 // The block element to be returned.
                 var block ;
-                
+
                 // The range object used to identify the paragraph contents.
                 var range ;
-                
+
                 // Indicated that the current element in the loop is the last one.
                 var isLast ;
-                
+
                 // Instructs to cleanup remaining BRs.
                 var removePreviousBr ;
@@ -161 +161 @@
                         }
 
-                        // The last node has been found.                
+                        // The last node has been found.
                         isLast = ( currentNode == lastNode ) ;
 
@@ -178 +178 @@
 
                                         currentNode = parentNode ;
+                                        isLast = ( currentNode == lastNode ) ;
                                         continueFromSibling = true ;
                                 }
@@ -230 +231 @@
                                 // Insert the fixed block into the DOM.
                                 range.InsertNode( block ) ;
-                                
+
                                 removePreviousBr = true ;
-                                removeLastBr = true ;                           
+                                removeLastBr = true ;
                         }
                         else if ( block.nodeName.toLowerCase() != 'li' )
@@ -251 +252 @@
                                         // right position for our intents.
                                         var splitInfo = range.SplitBlock() ;
-                                        
+
                                         removePreviousBr = !splitInfo.WasStartOfBlock ;
                                         removeLastBr = !splitInfo.WasEndOfBlock ;
@@ -265 +266 @@
                                 // the current range, which could be an <li> child (nested
                                 // lists) or the next sibling <li>.
-                                
+
                                 this._NextNode = FCKDomTools.GetNextSourceNode( range.EndNode, true ) ;
                                 return block ;
@@ -277 +278 @@
                                 previousSibling.parentNode.removeChild( previousSibling ) ;
                 }
-                
+
                 if ( removeLastBr )
                 {
@@ -284 +285 @@
                                 block.removeChild( lastChild ) ;
                 }
-                
+
                 // Get a reference for the next element. This is important because the
                 // above block can be removed or changed, so we can rely on it for the