Changeset 33475

Timestamp:

07/29/2015 04:29:36 AM (9 years ago)

Author:

markjaquith

Message:

Do not re-generate the password after pressing "cancel". Persist the state.

Also removes pass2 code not needed since we're generating from one field.

fixes #33164

File:

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

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

@@ -179 +179 @@
             $passwordWrapper.show();
 
-            generatePassword();
+            if ( $pass1Text.val().length === 0 ) {
+                generatePassword();
+            }
 
             _.defer( function() {
@@ -206 +208 @@
 
     function check_pass_strength() {
-        var pass1 = $('#pass1').val(), pass2 = $('#pass2').val(), strength;
+        var pass1 = $('#pass1').val(), strength;
 
         $('#pass-strength-result').removeClass('short bad good strong');
@@ -214 +216 @@
         }
 
-        strength = wp.passwordStrength.meter( pass1, wp.passwordStrength.userInputBlacklist(), pass2 );
+        strength = wp.passwordStrength.meter( pass1, wp.passwordStrength.userInputBlacklist(), pass1 );
 
         switch ( strength ) {