Ticket #25821: 25821.9.diff

src/wp-admin/js/widgets.js

@@ -440 +440 @@
                 // No longer "new" widget
                 widget.find( 'input.add_new' ).val('');
 
-                $( 'html, body' ).animate({
-                        scrollTop: sidebar.offset().top - 130
-                }, 200 );
 
+                /* 
+                 * Check if any part of the sidebar is visible in
+                 * the viewport. If it is, don't scroll. Otherwise,
+                 * scroll up to so the sidebar is in view.
+                 *
+                 * We do this by comparing the top, right, bottom, 
+                 * and left bounds of the sidebar so see if they
+                 * are within the bounds of the viewport.
+                 */
+                var viewport = {
+                        top: $(window).scrollTop(),
+                        left: $(window).scrollLeft()
+                };
+                viewport.right = viewport.left + $(window).width();
+                viewport.bottom = viewport.top + $(window).height();
+
+                var sidebar_bounds = sidebar.offset();
+                sidebar_bounds.right = sidebar_bounds.left + sidebar.outerWidth();
+                sidebar_bounds.bottom = sidebar_bounds.top + sidebar.outerHeight();
+
+                if ( viewport.top > sidebar_bounds.bottom || viewport.right < sidebar_bounds.left || viewport.bottom < sidebar_bounds.top || viewport.left > sidebar_bounds.right ) {
+                        $( 'html, body' ).animate({
+                                scrollTop: sidebar.offset().top - 130
+                        }, 200 );
+                }
+
                 window.setTimeout( function() {
                         // Cannot use a callback in the animation above as it fires twice,
                         // have to queue this "by hand".
@@ -468 +491 @@
 
 $(document).ready( function(){ wpWidgets.init(); } );
 
-})(jQuery);
+})(jQuery);
+ No newline at end of file