Ticket #33778: 33778.4.patch

js/user-profile.js

@@ -57 +57 @@
                         } );
 
                 $pass1.after( $pass1Text );
-
+                
                 if ( 1 === parseInt( $pass1.data( 'reveal' ), 10 ) ) {
                         generatePassword();
                 }
@@ -104 +104 @@
                                         .find( '.dashicons' )
                                                 .removeClass('dashicons-visibility')
                                                 .addClass('dashicons-hidden');
-
+                                        
                                 $pass1Text.focus();
+                                
+                                $pass1Row.find('th').children('label').attr({'for':'pass1-text'});
 
                                 if ( ! _.isUndefined( $pass1Text[0].setSelectionRange ) ) {
                                         $pass1Text[0].setSelectionRange( 0, 100 );
@@ -125 +127 @@
                                                 .addClass('dashicons-visibility');
 
                                 $pass1.focus();
+                                
+                                $pass1Row.find('th').children('label').attr({'for':'pass1'});
 
                                 if ( ! _.isUndefined( $pass1[0].setSelectionRange ) ) {
                                         $pass1[0].setSelectionRange( 0, 100 );
@@ -177 +181 @@
                 $passwordWrapper = $pass1Row.find('.wp-pwd').hide();
 
                 bindToggleButton();
+                
+                if( $pass1Row.find( 'button.wp-generate-pw' ).length )
+                        $pass1Row.find('th').children('label').attr({'for':'wp-generate-pw'});
+                else
+                        $pass1Row.find('th').children('label').attr({'for':'pass1-text'});
 
                 $generateButton = $pass1Row.find( 'button.wp-generate-pw' ).show();
                 $generateButton.on( 'click', function () {
@@ -207 +216 @@
                         // Clear password field to prevent update
                         $pass1.val( '' ).trigger( 'pwupdate' );
                         $submitButtons.prop( 'disabled', false );
+                        $pass1Row.find('th').children('label').attr({'for':'wp-generate-pw'});
                 } );
 
                 $pass1Row.closest('form').on( 'submit', function () {

user-new.php

@@ -404 +404 @@
 if ( apply_filters( 'show_password_fields', true ) ) : ?>
         <tr class="form-field form-required user-pass1-wrap">
                 <th scope="row">
-                        <label for="pass1">
+                        <label for="wp-generate-pw">
                                 <?php _e( 'Password' ); ?>
                                 <span class="description hide-if-js"><?php _e( '(required)' ); ?></span>
                         </label>
@@ -411 +411 @@
                 </th>
                 <td>
                         <input class="hidden" value=" " /><!-- #24364 workaround -->
-                        <button type="button" class="button button-secondary wp-generate-pw hide-if-no-js"><?php _e( 'Show password' ); ?></button>
+                        <button type="button" id="wp-generate-pw" class="button button-secondary wp-generate-pw hide-if-no-js"><?php _e( 'Show password' ); ?></button>
                         <div class="wp-pwd hide-if-js">
                                 <?php $initial_password = wp_generate_password( 24 ); ?>
                                 <span class="password-input-wrapper">

user-edit.php

@@ -463 +463 @@
 <h3><?php _e('Account Management'); ?></h3>
 <table class="form-table">
 <tr id="password" class="user-pass1-wrap">
-        <th><label for="pass1"><?php _e( 'New Password' ); ?></label></th>
+        <th><label for="wp-generate-pw"><?php _e( 'New Password' ); ?></label></th>
         <td>
                 <input class="hidden" value=" " /><!-- #24364 workaround -->
-                <button type="button" class="button button-secondary wp-generate-pw hide-if-no-js"><?php _e( 'Generate Password' ); ?></button>
+                <button type="button" id="wp-generate-pw" class="button button-secondary wp-generate-pw hide-if-no-js"><?php _e( 'Generate Password' ); ?></button>
                 <div class="wp-pwd hide-if-js">
                         <span class="password-input-wrapper">
                                 <input type="password" name="pass1" id="pass1" class="regular-text" value="" autocomplete="off" data-pw="<?php echo esc_attr( wp_generate_password( 24 ) ); ?>" aria-describedby="pass-strength-result" />