diff --git src/js/_enqueues/admin/user-profile.js src/js/_enqueues/admin/user-profile.js
index ff4830242c..117fe5247d 100644
--- src/js/_enqueues/admin/user-profile.js
+++ src/js/_enqueues/admin/user-profile.js
@@ -14,27 +14,30 @@
$toggleButton,
$submitButtons,
$submitButton,
- currentPass;
+ currentPass,
+ $passwordWrapper;
function generatePassword() {
if ( typeof zxcvbn !== 'function' ) {
setTimeout( generatePassword, 50 );
return;
- } else if ( ! $pass1.val() ) {
+ } else if ( ! $pass1.val() || $passwordWrapper.hasClass( 'is-open' ) ) {
// zxcvbn loaded before user entered password.
$pass1.val( $pass1.data( 'pw' ) );
$pass1.trigger( 'pwupdate' );
showOrHideWeakPasswordCheckbox();
- }
- else {
+ } else {
// zxcvbn loaded after the user entered password, check strength.
check_pass_strength();
showOrHideWeakPasswordCheckbox();
}
+ // Install screen
if ( 1 !== parseInt( $toggleButton.data( 'start-masked' ), 10 ) ) {
+ // Show the password not masked if admin_password hasn't been posted yet.
$pass1.attr( 'type', 'text' );
} else {
+ // Otherwise, mask the password.
$toggleButton.trigger( 'click' );
}
@@ -75,7 +78,7 @@
}
function bindToggleButton() {
- $toggleButton = $pass1Row.find('.wp-hide-pw');
+ $toggleButton = $pass1Row.find( '.wp-hide-pw' );
$toggleButton.show().on( 'click', function () {
if ( 'password' === $pass1.attr( 'type' ) ) {
$pass1.attr( 'type', 'text' );
@@ -84,24 +87,17 @@
$pass1.attr( 'type', 'password' );
resetToggle( true );
}
-
- $pass1.focus();
-
- if ( ! _.isUndefined( $pass1[0].setSelectionRange ) ) {
- $pass1[0].setSelectionRange( 0, 100 );
- }
});
}
function bindPasswordForm() {
- var $passwordWrapper,
- $generateButton,
+ var $generateButton,
$cancelButton;
$pass1Row = $( '.user-pass1-wrap, .user-pass-wrap' );
// Hide the confirm password field when JavaScript support is enabled.
- $('.user-pass2-wrap').hide();
+ $( '.user-pass2-wrap' ).hide();
$submitButton = $( '#submit, #wp-submit' ).on( 'click', function () {
updateLock = false;
@@ -115,7 +111,7 @@
$submitButtons.prop( 'disabled', ! $weakCheckbox.prop( 'checked' ) );
} );
- $pass1 = $('#pass1');
+ $pass1 = $( '#pass1' );
if ( $pass1.length ) {
bindPass1();
} else {
@@ -123,7 +119,7 @@
$pass1 = $( '#user_pass' );
}
- /**
+ /*
* Fix a LastPass mismatch issue, LastPass only changes pass2.
*
* This fixes the issue by copying any changes from the hidden
@@ -149,24 +145,26 @@
bindToggleButton();
- if ( $generateButton.length ) {
- $passwordWrapper.hide();
- }
-
- $generateButton.show();
$generateButton.on( 'click', function () {
updateLock = true;
- $generateButton.hide();
- $passwordWrapper.show();
+ $generateButton.attr( 'aria-expanded', 'true' );
+
+ $passwordWrapper
+ .show()
+ .addClass( 'is-open' );
// Enable the inputs when showing.
$pass1.attr( 'disabled', false );
$pass2.attr( 'disabled', false );
- if ( $pass1.val().length === 0 ) {
- generatePassword();
- }
+ // Always generate a password when clicking the button.
+ wp.ajax.post( 'generate-password' )
+ .done( function( data ) {
+ $pass1.data( 'pw', data );
+ generatePassword();
+ resetToggle();
+ } );
} );
$cancelButton = $pass1Row.find( 'button.wp-cancel-pw' );
@@ -174,32 +172,7 @@
updateLock = false;
// Clear any entered password.
- $pass1.val( '' );
-
- // Generate a new password.
- wp.ajax.post( 'generate-password' )
- .done( function( data ) {
- $pass1.data( 'pw', data );
- } );
-
- $generateButton.show().focus();
- $passwordWrapper.hide();
-
- $weakRow.hide( 0, function () {
- $weakCheckbox.removeProp( 'checked' );
- } );
-
- // Disable the inputs when hiding to prevent autofill and submission.
- $pass1.prop( 'disabled', true );
- $pass2.prop( 'disabled', true );
-
- resetToggle( false );
-
- if ( $pass1Row.closest( 'form' ).is( '#your-profile' ) ) {
- // Clear password field to prevent update.
- $pass1.val( '' ).trigger( 'pwupdate' );
- $submitButtons.prop( 'disabled', false );
- }
+ $pass1.val( '' ).trigger( 'pwupdate' );
} );
$pass1Row.closest( 'form' ).on( 'submit', function () {
@@ -313,7 +286,8 @@
});
/**
- * Replaces "Howdy, *" in the admin toolbar whenever the display name dropdown is updated for one's own profile.
+ * Replaces "Howdy, *" in the admin toolbar whenever the display name
+ dropdown is updated for one's own profile.
*/
select.on( 'change', function() {
if ( user_id !== current_user_id ) {
@@ -399,7 +373,7 @@
window.generatePassword = generatePassword;
- /* Warn the user if password was generated but not saved */
+ // Warn the user if password was generated but not saved.
$( window ).on( 'beforeunload', function () {
if ( true === updateLock ) {
return userProfileL10n.warn;
diff --git src/wp-admin/css/forms.css src/wp-admin/css/forms.css
index c364ca403d..6b27c0d4b1 100644
--- src/wp-admin/css/forms.css
+++ src/wp-admin/css/forms.css
@@ -589,6 +589,10 @@ fieldset label,
padding-top: 8px;
}
+.wp-generate-pw + .wp-pwd {
+ margin-top: 1em;
+}
+
.wp-pwd [type="text"],
.wp-pwd [type="password"] {
margin-bottom: 0;
diff --git src/wp-admin/css/login.css src/wp-admin/css/login.css
index d5c60f117a..77b2828175 100644
--- src/wp-admin/css/login.css
+++ src/wp-admin/css/login.css
@@ -79,6 +79,22 @@ p {
margin-bottom: 15px;
}
+.login .wp-hide-pw-wrapper {
+ display: table-cell;
+ vertical-align: top;
+}
+
+.login .button.button-secondary {
+ height: 36px;
+ margin: 0;
+ border-radius: 0;
+ line-height: normal;
+}
+
+.xxlogin .xxwp-hide-pw .xxdashicons {
+ position: static;
+}
+
.login .button.wp-hide-pw {
background: transparent;
border: 1px solid transparent;
diff --git src/wp-admin/user-edit.php src/wp-admin/user-edit.php
index de5131af24..73efdc0e1e 100644
--- src/wp-admin/user-edit.php
+++ src/wp-admin/user-edit.php
@@ -628,7 +628,7 @@ endif;
|
-
+
|