Ticket #36337: 36337.3.diff

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

@@ -77 +77 @@
          * @param {Function} [params.completeCallback]
          */
         focus = function ( params ) {
-                var construct, completeCallback, focus;
+                var construct, completeCallback, focus, focusElement;
                 construct = this;
                 params = params || {};
                 focus = function () {
@@ -90 +90 @@
                                 focusContainer = construct.container;
                         }
 
-                        // Note that we can't use :focusable due to a jQuery UI issue. See: https://github.com/jquery/jquery-ui/pull/1583
-                        focusContainer.find( 'input, select, textarea, button, object, a[href], [tabindex]' ).filter( ':visible' ).first().focus();
+                        focusElement = focusContainer.find( '.control-focus:first' );
+                        if ( 0 === focusElement.length ) {
+                                // Note that we can't use :focusable due to a jQuery UI issue. See: https://github.com/jquery/jquery-ui/pull/1583
+                                focusElement = focusContainer.find( 'input, select, textarea, button, object, a[href], [tabindex]' ).filter( ':visible' ).first();
+                        }
+                        focusElement.focus();
                 };
                 if ( params.completeCallback ) {
                         completeCallback = params.completeCallback;

src/wp-includes/customize/class-wp-customize-media-control.php

@@ -196 +196 @@
                         <div class="actions">
                                 <# if ( data.canUpload ) { #>
                                 <button type="button" class="button remove-button">{{ data.button_labels.remove }}</button>
-                                <button type="button" class="button upload-button" id="{{ data.settings['default'] }}-button">{{ data.button_labels.change }}</button>
+                                <button type="button" class="button upload-button control-focus" id="{{ data.settings['default'] }}-button">{{ data.button_labels.change }}</button>
                                 <div style="clear:both"></div>
                                 <# } #>
                         </div>