Changeset 2159

Timestamp:

2008-07-03 12:25:47 (6 months ago)

Author:

martinkou

Message:

Fixed #2320 : Fixed the issue where the Find/Replace dialog scrolls the entire page.

Location:

FCKeditor/trunk

Files:

• editor/dialog/fck_replace.html (modified) (1 diff)
• editor/_source/internals/fckdomtools.js (modified) (1 diff)
• _whatsnew.html (modified) (1 diff)

FCKeditor/trunk/editor/dialog/fck_replace.html

@@ -186 +186 @@
                 if ( focusNode.nodeType != 1 )
                         focusNode = focusNode.parentNode ;
-                focusNode.scrollIntoView( false ) ;
+                FCKDomTools.ScrollIntoView( focusNode, false ) ;
                 this._cursors = charRange._cursors ;
         },

FCKeditor/trunk/editor/_source/internals/fckdomtools.js

@@ -990 +990 @@
                 if ( alignTop === false )
                 {
-                        offset += element.offsetHeight ;
+                        offset += element.offsetHeight || 0 ;
 
                         // Consider the margin in the scroll, which is ok for our current
                         // needs, but needs investigation if we will be using this function
                         // in other places.
-                        offset += parseInt( this.GetCurrentElementStyle( element, 'marginBottom' ) || 0, 10 ) ;
+                        offset += parseInt( this.GetCurrentElementStyle( element, 'marginBottom' ) || 0, 10 ) || 0 ;
                 }
 
                 // Appends the offsets for the entire element hierarchy.
-                offset += element.offsetTop ;
-                while ( ( element = element.offsetParent ) )
-                        offset += element.offsetTop || 0 ;
+                var elementPosition = FCKTools.GetDocumentPosition( window, element ) ;
+                offset += elementPosition.y ;
 
                 // Scroll the window to the desired position, if not already visible.

FCKeditor/trunk/_whatsnew.html

@@ -71 +71 @@
                         where the merge down command for tables cells does not work in IE for more than two
                         cells.</li>
+                <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2320">#2320</a>] Fixed the issue
+                        where the Find/Replace dialog scrolls the entire page.</li>
         </ul>
         <p>