Ticket #33162: 33162.2.diff

src/wp-admin/install.php

@@ -137 +137 @@
                         </th>
                         <td>
                                 <div class="">
-                                        <?php $initial_password = wp_generate_password( 18 ); ?>
+                                        <?php $initial_password = isset( $_POST['admin_password'] ) ? stripslashes( $_POST['admin_password'] ) : wp_generate_password( 18 ); ?>
                                         <input type="password" name="admin_password" id="pass1" class="regular-text" autocomplete="off" data-reveal="1" data-pw="<?php echo esc_attr( $initial_password ); ?>" aria-describedby="pass-strength-result" />
-                                        <button type="button" class="button button-secondary wp-hide-pw hide-if-no-js" data-toggle="0" aria-label="<?php esc_attr_e( 'Hide password' ); ?>">
+                                        <button type="button" class="button button-secondary wp-hide-pw hide-if-no-js" data-start-masked="<?php echo (int) isset( $_POST['admin_password'] ); ?>" data-toggle="0" aria-label="<?php esc_attr_e( 'Hide password' ); ?>">
                                                 <span class="dashicons dashicons-hidden"></span>
                                                 <span class="text"><?php _e( 'Hide' ); ?></span>
                                         </button>

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

@@ -12 +12 @@
                 $weakRow,
                 $weakCheckbox,
 
+                $toggleButton,
                 $submitButtons,
                 $submitButton,
                 currentPass;
@@ -22 +23 @@
                 } else {
                         $pass1.val( $pass1.data( 'pw' ) );
                         $pass1.trigger( 'pwupdate' );
-                        $pass1Wrap.addClass( 'show-password' );
+                        if ( 1 !== parseInt( $toggleButton.data( 'start-masked' ), 10 ) ) {
+                                $pass1Wrap.addClass( 'show-password' );
+                        } else {
+                                $toggleButton.trigger( 'click' );
+                        }
                 }
         }
 
@@ -82 +87 @@
         }
 
         function bindToggleButton() {
-                var toggleButton = $pass1Row.find('.wp-hide-pw');
-                toggleButton.show().on( 'click', function () {
-                        if ( 1 === parseInt( toggleButton.data( 'toggle' ), 10 ) ) {
+                $toggleButton = $pass1Row.find('.wp-hide-pw');
+                $toggleButton.show().on( 'click', function () {
+                        if ( 1 === parseInt( $toggleButton.data( 'toggle' ), 10 ) ) {
                                 $pass1Wrap.addClass( 'show-password' );
-                                toggleButton
+                                $toggleButton
                                         .data( 'toggle', 0 )
                                         .attr({
                                                 'aria-label': userProfileL10n.ariaHide
@@ -105 +110 @@
                                 }
                         } else {
                                 $pass1Wrap.removeClass( 'show-password' );
-                                toggleButton
+                                $toggleButton
                                         .data( 'toggle', 1 )
                                         .attr({
                                                 'aria-label': userProfileL10n.ariaShow