Ticket #33778: 33778.6.patch

src/wp-admin/js/user-profile.js

@@ -6 +6 @@
                 $pass1Wrap,
                 $pass1,
                 $pass1Text,
+                $pass1Label,
 
                 $pass2,
 
@@ -107 +108 @@
 
                                 $pass1Text.focus();
 
+                                $pass1Label.attr( 'for', 'pass1-text' );
+
                                 if ( ! _.isUndefined( $pass1Text[0].setSelectionRange ) ) {
                                         $pass1Text[0].setSelectionRange( 0, 100 );
                                 }
@@ -126 +129 @@
 
                                 $pass1.focus();
 
+                                $pass1Label.attr( 'for', 'pass1' );
+
                                 if ( ! _.isUndefined( $pass1[0].setSelectionRange ) ) {
                                         $pass1[0].setSelectionRange( 0, 100 );
                                 }
@@ -139 +144 @@
                         $cancelButton;
 
                 $pass1Row = $('.user-pass1-wrap');
+                $pass1Label = $pass1Row.find('th label');
+
                 // hide this
                 $('.user-pass2-wrap').hide();
 
@@ -197 +204 @@
                         }, 0 );
                 } );
 
+                if( $generateButton.length ) {
+                        $pass1Label.attr( 'for', 'wp-generate-pw' );
+                } else {
+                        $pass1Label.attr( 'for', 'pass1-text' );
+                }
+
                 $cancelButton = $pass1Row.find( 'button.wp-cancel-pw' );
                 $cancelButton.on( 'click', function () {
                         updateLock = false;
@@ -207 +220 @@
                         // Clear password field to prevent update
                         $pass1.val( '' ).trigger( 'pwupdate' );
                         $submitButtons.prop( 'disabled', false );
+                        $pass1Label.attr( 'for', 'wp-generate-pw' );
                 } );
 
                 $pass1Row.closest('form').on( 'submit', function () {

src/wp-admin/user-edit.php

@@ -450 +450 @@
         <th><label for="pass1"><?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" />

src/wp-admin/user-new.php

@@ -412 +412 @@
                 </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">