diff --git src/wp-admin/js/updates.js src/wp-admin/js/updates.js
index 77f0399..9ff3d29 100644
--- src/wp-admin/js/updates.js
+++ src/wp-admin/js/updates.js
@@ -79,6 +79,15 @@ window.wp = window.wp || {};
wp.updates.updateQueue = [];
/**
+ * Store a jQuery reference to return focus to when exiting the request credentials modal.
+ *
+ * @since 4.2.0
+ *
+ * @var jQuery object
+ */
+ wp.updates.$elToReturnFocusToFromCredentialsModal = null;
+
+ /**
* Decrement update counts throughout the various menus.
*
* @since 3.9.0
@@ -247,12 +256,12 @@ window.wp = window.wp || {};
* @since 4.2.0
*/
wp.updates.showErrorInCredentialsForm = function( message ) {
- var $notificationDialog = $( '.notification-dialog' );
+ var $modal = $( '.notification-dialog' );
- // Remove any existing error
- $notificationDialog.find( '.error' ).remove();
+ // Remove any existing error.
+ $modal.find( '.error' ).remove();
- $notificationDialog.find( 'h3' ).after( '
' + message + '
' );
+ $modal.find( 'h3' ).after( '
' + message + '
' );
};
/**
@@ -361,7 +370,8 @@ window.wp = window.wp || {};
};
/**
- * If an install/update job has been placed in the queue, queueChecker pulls it out and runs it.
+ * If an install/update job has been placed in the queue,
+ * queueChecker pulls it out and runs it.
*
* @since 4.2.0
*/
@@ -388,18 +398,74 @@ window.wp = window.wp || {};
/**
- * Request the users filesystem credentials if we don't have them already
+ * Request the users filesystem credentials if we don't have them already.
*
* @since 4.2.0
*/
- wp.updates.requestFilesystemCredentials = function() {
+ wp.updates.requestFilesystemCredentials = function( event ) {
if ( wp.updates.updateDoneSuccessfully === false ) {
+ /*
+ * For the plugin install screen, return the focus to the install button
+ * after exiting the credentials request modal.
+ */
+ if ( adminpage === 'plugin-install-php' ) {
+ wp.updates.$elToReturnFocusToFromCredentialsModal = $( event.target );
+ }
+
wp.updates.updateLock = true;
- $( 'body' ).addClass( 'modal-open' );
- $( '#request-filesystem-credentials-dialog' ).show();
+
+ wp.updates.requestForCredentialsModalOpen();
}
};
+ /**
+ * Keydown handler for the request for credentials modal.
+ *
+ * Close the modal when the escape key is pressed.
+ * Constrain keyboard navigation to inside the modal.
+ *
+ * @since 4.2.0
+ */
+ wp.updates.keydown = function( event ) {
+ if ( 27 === event.keyCode ) {
+ wp.updates.requestForCredentialsModalClose();
+ } else if ( 9 === event.keyCode ) {
+ // #upgrade button must always be the last focusable element in the dialog.
+ if ( event.target.id === 'upgrade' && ! event.shiftKey ) {
+ $( '#hostname' ).focus();
+ event.preventDefault();
+ } else if ( event.target.id === 'hostname' && event.shiftKey ) {
+ $( '#upgrade' ).focus();
+ event.preventDefault();
+ }
+ }
+ };
+
+ /**
+ * Open the request for credentials modal.
+ *
+ * @since 4.2.0
+ */
+ wp.updates.requestForCredentialsModalOpen = function() {
+ var $modal = $( '#request-filesystem-credentials-dialog' );
+ $( 'body' ).addClass( 'modal-open' );
+ $modal.show();
+
+ $modal.find( '#hostname' ).focus();
+ $modal.keydown( wp.updates.keydown );
+ };
+
+ /**
+ * Close the request for credentials modal.
+ *
+ * @since 4.2.0
+ */
+ wp.updates.requestForCredentialsModalClose = function() {
+ $( '#request-filesystem-credentials-dialog' ).hide();
+ $( 'body' ).removeClass( 'modal-open' );
+ wp.updates.$elToReturnFocusToFromCredentialsModal.focus();
+ };
+
$( document ).ready( function() {
/*
* Check whether a user needs to submit filesystem credentials based on whether
@@ -419,8 +485,7 @@ window.wp = window.wp || {};
wp.updates.filesystemCredentials.ssh.publicKey = $('#public_key').val();
wp.updates.filesystemCredentials.ssh.privateKey = $('#private_key').val();
- $( '#request-filesystem-credentials-dialog' ).hide();
- $( 'body' ).removeClass( 'modal-open' );
+ wp.updates.requestForCredentialsModalClose();
// Unlock and invoke the queue.
wp.updates.updateLock = false;
@@ -429,14 +494,21 @@ window.wp = window.wp || {};
return false;
});
+ // Close the request credentials modal when
+ $( '#request-filesystem-credentials-dialog [data-js-action="close"]' ).on( 'click', function() {
+ wp.updates.requestForCredentialsModalClose();
+ });
+
// Click handler for plugin updates in List Table view.
$( '.plugin-update-tr .update-link' ).on( 'click', function( e ) {
e.preventDefault();
if ( wp.updates.shouldRequestFilesystemCredentials && ! wp.updates.updateLock ) {
- wp.updates.requestFilesystemCredentials();
+ wp.updates.requestFilesystemCredentials( e );
}
- var $row = $( e.target ).parents( '.plugin-update-tr' );
- wp.updates.updatePlugin( $row.data( 'plugin' ), $row.data( 'slug' ) );
+ var updateRow = $( e.target ).parents( '.plugin-update-tr' );
+ // Return the user to the input box of the plugin's table row after closing the modal.
+ wp.updates.$elToReturnFocusToFromCredentialsModal = $( '#' + updateRow.data( 'slug' ) ).find( '.check-column input' );
+ wp.updates.updatePlugin( updateRow.data( 'plugin' ), updateRow.data( 'slug' ) );
} );
$( '#bulk-action-form' ).on( 'submit', function( e ) {
@@ -466,7 +538,7 @@ window.wp = window.wp || {};
$( '.plugin-card .install-now' ).on( 'click', function( e ) {
e.preventDefault();
if ( wp.updates.shouldRequestFilesystemCredentials && ! wp.updates.updateLock ) {
- wp.updates.requestFilesystemCredentials();
+ wp.updates.requestFilesystemCredentials( e );
}
var $button = $( e.target );
if ( $button.hasClass( 'button-disabled' ) ) {