Ticket #7429: 7429.patch

_source/core/dom/element.js

@@ -1347 +1347 @@
                         return { x : x, y : y };
                 },
 
-                scrollIntoView : function( alignTop )
+                scrollIntoView : function()
                 {
                         // Get the element window.
                         var win = this.getWindow(),
                                 winHeight = win.getViewPaneSize().height;
 
-                        // Starts from the offset that will be scrolled with the negative value of
-                        // the visible window height.
-                        var offset = winHeight * -1;
+                        var startOffset = this.getDocumentPosition().y,
+                                endOffset = startOffset + this.$.offsetHeight || 0 + parseInt( this.getComputedStyle( 'marginBottom' ) || 0, 10 ) || 0;
 
-                        // Append the view pane's height if align to top.
-                        // Append element height if we are aligning to the bottom.
-                        if ( alignTop )
-                                offset += winHeight;
-                        else
-                        {
-                                offset += this.$.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.getComputedStyle( 'marginBottom' ) || 0, 10 ) || 0;
-                        }
-
-                        // Append the offsets for the entire element hierarchy.
-                        var elementPosition = this.getDocumentPosition();
-                        offset += elementPosition.y;
-
-                        // offset value might be out of range(nagative), fix it(#3692).
-                        offset = offset < 0 ? 0 : offset;
-
                         // Scroll the window to the desired position, if not already visible(#3795).
                         var currentScroll = win.getScrollPosition().y;
-                        if ( offset > currentScroll || offset < currentScroll - winHeight )
-                                win.$.scrollTo( 0, offset );
+
+                        // Bring it to bottom if  overflow forward.
+                        if ( endOffset > currentScroll + winHeight )
+                                win.$.scrollTo( 0, endOffset - winHeight );
+                        // Bring it to top if overflow backward.
+                        else if ( startOffset < currentScroll )
+                                win.$.scrollTo( 0, startOffset );
                 },
 
                 setState : function( state )

_source/plugins/maximize/plugin.js

@@ -311 +311 @@
 
                                                                 editor.getSelection().selectRanges(savedSelection);
                                                                 var element = editor.getSelection().getStartElement();
-                                                                element && element.scrollIntoView( true );
+                                                                element && element.scrollIntoView();
                                                         }
 
                                                         else