Changeset 34539

Timestamp:

09/25/2015 01:53:04 PM (9 years ago)

Author:

wonderboymusic

Message:

Profile: when clicking "Generate Password", toggling visibility, then canceling, ensure that the UI resets properly for when the "Generate Password" button is clicked again.

Props umesh.nevase.
Fixes #33897.

File:

• trunk/src/wp-admin/js/user-profile.js (modified) (3 diffs)

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

@@ -99 +99 @@
     }
 
+    function resetToggle() {
+        $toggleButton
+            .data( 'toggle', 0 )
+            .attr({
+                'aria-label': userProfileL10n.ariaHide
+            })
+            .find( '.text' )
+                .text( userProfileL10n.hide )
+            .end()
+            .find( '.dashicons' )
+                .removeClass( 'dashicons-visibility' )
+                .addClass( 'dashicons-hidden' );
+
+        $pass1Text.focus();
+
+        $pass1Label.attr( 'for', 'pass1-text' );
+    }
+
     function bindToggleButton() {
         $toggleButton = $pass1Row.find('.wp-hide-pw');
@@ -104 +122 @@
             if ( 1 === parseInt( $toggleButton.data( 'toggle' ), 10 ) ) {
                 $pass1Wrap.addClass( 'show-password' );
-                $toggleButton
-                    .data( 'toggle', 0 )
-                    .attr({
-                        'aria-label': userProfileL10n.ariaHide
-                    })
-                    .find( '.text' )
-                        .text( userProfileL10n.hide )
-                    .end()
-                    .find( '.dashicons' )
-                        .removeClass('dashicons-visibility')
-                        .addClass('dashicons-hidden');
-
-                $pass1Text.focus();
-
-                $pass1Label.attr( 'for', 'pass1-text' );
+
+                resetToggle();
 
                 if ( ! _.isUndefined( $pass1Text[0].setSelectionRange ) ) {
@@ -234 +239 @@
             $generateButton.show();
             $passwordWrapper.hide();
+
+            resetToggle();
 
             // Clear password field to prevent update