Changeset 31920

Timestamp:

03/29/2015 11:16:30 AM (10 years ago)

Author:

ocean90

Message:

Customizer: Fix calculation of panel positions when accessing via deep-links.

Make sure that the parent li is shown before attempting to calculate its position.
Improve also the logic for focusing on a panel to prevent focusing hidden elements.

props westonruter.
fixes #31014.
see #31794.

File:

• trunk/src/wp-admin/js/customize-controls.js (modified) (3 diffs)

trunk/src/wp-admin/js/customize-controls.js

@@ -68 +68 @@
         params = params || {};
         focus = function () {
-            construct.container.find( ':focusable:first' ).focus();
-            construct.container[0].scrollIntoView( true );
+            var focusContainer;
+            if ( construct.extended( api.Panel ) && construct.expanded() ) {
+                focusContainer = construct.container.find( '.control-panel-content:first' );
+            } else {
+                focusContainer = construct.container;
+            }
+            focusContainer.find( ':focusable:first' ).focus();
+            focusContainer[0].scrollIntoView( true );
         };
         if ( params.completeCallback ) {
@@ -716 +722 @@
                     position = content.offset().top;
                     scroll = container.scrollTop();
-                    content.css( 'margin-top', ( 45 - position - scroll ) );
+                    content.css( 'margin-top', ( $( '#customize-header-actions' ).height() - position - scroll ) );
                     section.addClass( 'current-panel' );
                     overlay.addClass( 'in-themes-panel' );
@@ -1040 +1046 @@
 
                 content.show( 0, function() {
+                    content.parent().show();
                     position = content.offset().top;
                     scroll = container.scrollTop();
-                    content.css( 'margin-top', ( 45 - position - scroll ) );
+                    content.css( 'margin-top', ( $( '#customize-header-actions' ).height() - position - scroll ) );
                     section.addClass( 'current-panel' );
                     overlay.addClass( 'in-sub-panel' );