Changeset 33495

Timestamp:

07/29/2015 07:21:26 PM (10 years ago)

Author:

markjaquith

Message:

Persist (and mask) the password on the install screen if the install does not proceed due to errors.

If you forget or enter an invalid username/e-mail, the password choosing shouldn't start over.

fixes #33162

Location:

trunk/src/wp-admin

Files:

• install.php (modified) (1 diff)
• js/user-profile.js (modified) (4 diffs)

trunk/src/wp-admin/install.php

@@ -138 +138 @@
             <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>

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

@@ -13 +13 @@
         $weakCheckbox,
 
+        $toggleButton,
         $submitButtons,
         $submitButton,
@@ -23 +24 @@
             $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' );
+            }
         }
     }
@@ -83 +88 @@
 
     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({
@@ -106 +111 @@
             } else {
                 $pass1Wrap.removeClass( 'show-password' );
-                toggleButton
+                $toggleButton
                     .data( 'toggle', 1 )
                     .attr({