Ticket #27406: 27406.scroll-position-fixes.diff

src/wp-admin/js/accordion.js

@@ -69 +69 @@
         }
 
         function panelSwitch( panel ) {
-                var position,
+                var position, scroll,
                         section = panel.closest( '.accordion-section' ),
-                        container = section.closest( '.wp-full-overlay' ),
+                        overlay = section.closest( '.wp-full-overlay' ),
+                        container = section.closest( '.accordion-container' ),
                         siblings = container.find( '.accordion-section.open' ),
                         content = section.find( '.control-panel-content' );
 
                 if ( section.hasClass( 'current-panel' ) ) {
                         section.toggleClass( 'current-panel' );
-                        container.toggleClass( 'in-sub-panel' );
+                        overlay.toggleClass( 'in-sub-panel' );
                         content.delay( 180 ).hide( 0, function() {
                                 content.css( 'margin-top', 'inherit' ); // Reset
                         } );
+                        container.scrollTop( 0 );
                 } else {
                         siblings.removeClass( 'open' );
                         content.show( 0, function() {
                                 position = content.offset().top;
-                                content.css( 'margin-top', ( 45 - position ) );
+                                scroll = container.scrollTop();
+                                content.css( 'margin-top', ( 45 - position - scroll ) );
                                 section.toggleClass( 'current-panel' );
-                                container.toggleClass( 'in-sub-panel' );
+                                overlay.toggleClass( 'in-sub-panel' );
+                                container.scrollTop( 0 );
                         } );
                 }
         }