Ticket #25821: 25821.10.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 and bottom, of
+                 * the sidebar so see if they are within the bounds
+                 * of the viewport.
+                 */
+                var viewport_top = $(window).scrollTop(),
+                        viewport_bottom = viewport_top + $(window).height(),
+                        sidebar_bounds = sidebar.offset();
+                
+                sidebar_bounds.bottom = sidebar_bounds.top + sidebar.outerHeight();
+
+                if ( viewport_top > sidebar_bounds.bottom || viewport_bottom < sidebar_bounds.top ) {
+                        $( '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 +486 @@
 
 $(document).ready( function(){ wpWidgets.init(); } );
 
-})(jQuery);
+})(jQuery);
+ No newline at end of file

src/wp-admin/themes.php

@@ -270 +270 @@
 
                         <div class="theme-info">
                                 <# if ( data.active ) { #>
-                                        <span class="current-label"><?php _e( 'Current Theme' ); ?></span>
+                                        <span class="current-label"><?php _e( 'Active Theme' ); ?></span>
                                 <# } #>
                                 <h3 class="theme-name">{{{ data.name }}}<span class="theme-version"><?php printf( __( 'Version: %s' ), '{{{ data.version }}}' ); ?></span></h3>
                                 <h4 class="theme-author"><?php printf( __( 'By %s' ), '{{{ data.authorAndUri }}}' ); ?></h4>