Changeset 1124

Timestamp:

2007-11-27 15:12:00 (2 years ago)

Author:

fredck

Message:

Fixed #1462 : The enter key will not any more scroll the main window. We are not using a custom implementation of scrollIntoView for Safari only.

Location:

FCKeditor/trunk

Files:

• editor/dialog/fck_replace.html (modified) (1 diff)
• editor/_source/classes/fckenterkey.js (modified) (2 diffs)
• editor/_source/internals/fckdomtools.js (modified) (3 diffs)
• _whatsnew.html (modified) (1 diff)

FCKeditor/trunk/editor/dialog/fck_replace.html

@@ -351 +351 @@
                 while ( focus && focus.nodeType != 1 )
                         focus = focus.parentNode ;
+
                 if ( focus )
-                focus.scrollIntoView( false ) ;
+                {
+                        if ( oEditor.FCKBrowserInfo.IsSafari )
+                                oEditor.FCKDomTools.ScrollIntoView( focus, false ) ;
+                        else
+                                focus.scrollIntoView( false ) ;
+                }
+
                 return true;
         }

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

@@ -493 +493 @@
                         oRange.MoveToElementEditStart( bIsStartOfBlock && !bIsEndOfBlock ? eNextBlock : eNewBlock ) ;
 
-                        if ( FCKBrowserInfo.IsGeckoLike )
+                        if ( FCKBrowserInfo.IsSafari )
+                                FCKDomTools.ScrollIntoView( eNewBlock, false ) ;
+                        else if ( FCKBrowserInfo.IsGeckoLike )
                                 eNewBlock.scrollIntoView( false ) ;
                 }
@@ -575 +577 @@
                                 else
                                         dummy = this.Window.document.createElement( 'br' ) ;
+
                                 eLineBreak.parentNode.insertBefore( dummy, eLineBreak.nextSibling ) ;
-                                dummy.scrollIntoView( false ) ;
+
+                                if ( FCKBrowserInfo.IsSafari )
+                                        FCKDomTools.ScrollIntoView( dummy, false ) ;
+                                else
+                                        dummy.scrollIntoView( false ) ;
+
                                 dummy.parentNode.removeChild( dummy ) ;
                         }

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

@@ -254 +254 @@
                                 if ( ignoreElements && currentNode.nodeName.IEquals( ignoreElements ) )
                                         return this.GetNextSourceElement( currentNode, ignoreSpaceTextOnly, stopSearchElements, ignoreElements ) ;
-                                
+
                                 return currentNode ;
                         }
@@ -315 +315 @@
                                 return this.GetPreviousSourceNode( currentNode.parentNode, true, nodeType, stopSearchNode ) ;
                 }
-                
+
                 if ( nodeType && node && node.nodeType != nodeType )
                         return this.GetPreviousSourceNode( node, false, nodeType, stopSearchNode ) ;
@@ -940 +940 @@
                 }
                 return null ;
+        },
+
+        /**
+         * Current implementation for ScrollIntoView (due to #1462). We don't have
+         * a complete implementation here, just the things that fit our needs.
+         */
+        ScrollIntoView : function( element, alignTop )
+        {
+                // Get the element window.
+                var window = FCKTools.GetElementWindow( element ) ;
+                var windowHeight = FCKTools.GetViewPaneSize( window ).Height ;
+                
+                // Starts the offset that will be scrolled with the negative value of
+                // the visible window height.
+                var offset = windowHeight * -1 ;
+
+                // Appends the height it we are about to align the bottoms.
+                if ( alignTop === false )
+                {
+                        offset += element.offsetHeight ;
+                        
+                        // 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( window, element, 'marginBottom' ) || 0, 10 ) ;
+                }
+
+                // Appends the offsets for the entire element hierarchy.
+                offset += element.offsetTop ;
+                while ( ( element = element.parentNode ) )
+                        offset += element.offsetTop || 0 ;
+                
+                // Scroll the window to the desired position, if not already visible.
+                var currentScroll = FCKTools.GetScrollPosition( window ).Y ;
+                if ( offset > 0 && offset > currentScroll )
+                        window.scrollTo( 0, offset ) ;
         }
 } ;

FCKeditor/trunk/_whatsnew.html

@@ -132 +132 @@
                                         and "More colors..." buttons were improperly styled in the color selector panels
                                         (Opera too).</li>
+                                <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1462">#1462</a>] The enter
+                                        key will not any more scroll the main window.</li>
                         </ul>
                 </li>
-                <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1562">#1562</a>] Fixed the issue where empty paragraphs
-                        are added around page breaks each time the user switches to Source mode.</li>
+                <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1562">#1562</a>] Fixed
+                        the issue where empty paragraphs are added around page breaks each time the user
+                        switches to Source mode.</li>
         </ul>
         <h3>