Ticket #36018: 36018.1.diff

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

@@ -3468 +3468 @@
                 });
 
                 // Focus the autofocused element
-                _.each( [ 'panel', 'section', 'control' ], function ( type ) {
-                        var instance, id = api.settings.autofocus[ type ];
-                        if ( id && api[ type ]( id ) ) {
-                                instance = api[ type ]( id );
-                                // Wait until the element is embedded in the DOM
-                                instance.deferred.embedded.done( function () {
-                                        // Wait until the preview has activated and so active panels, sections, controls have been set
-                                        api.previewer.deferred.active.done( function () {
+                _.each( [ 'panel', 'section', 'control' ], function( type ) {
+                        var id = api.settings.autofocus[ type ];
+                        if ( ! id ) {
+                                return;
+                        }
+
+                        /*
+                         * Defer focus until:
+                         * 1. The panel, section, or control exists (especially for dynamically-created ones).
+                         * 2. The instance is embedded in the document (and so is focusable).
+                         * 3. The preview has finished loading so that the active states have been set.
+                         */
+                        api[ type ]( id, function( instance ) {
+                                instance.deferred.embedded.done( function() {
+                                        api.previewer.deferred.active.done( function() {
                                                 instance.focus();
                                         });
                                 });
-                        }
+                        });
                 });
 
                 /**

src/wp-includes/class-wp-customize-manager.php

@@ -1755 +1755 @@
 
                 // Pass to front end the Customizer construct being deeplinked.
                 foreach ( $this->get_autofocus() as $type => $id ) {
-                        $can_autofocus = (
-                                ( 'control' === $type && $this->get_control( $id ) && $this->get_control( $id )->check_capabilities() )
-                                ||
-                                ( 'section' === $type && isset( $settings['sections'][ $id ] ) )
-                                ||
-                                ( 'panel' === $type && isset( $settings['panels'][ $id ] ) )
-                        );
-                        if ( $can_autofocus ) {
-                                $settings['autofocus'][ $type ] = $id;
-                        }
+                        $settings['autofocus'][ $type ] = $id;
                 }
 
                 ?>