Changeset 33364

Timestamp:

07/22/2015 06:35:51 PM (9 years ago)

Author:

markjaquith

Message:

Introduce a Cancel button and onUnload warning for password changes.

fixes #33079
props johnjamesjacoby

Location:

trunk/src

Files:

• wp-admin/js/user-profile.js (modified) (6 diffs)
• wp-admin/user-edit.php (modified) (1 diff)
• wp-admin/user-new.php (modified) (1 diff)
• wp-includes/script-loader.php (modified) (1 diff)

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

@@ -8 +8 @@
             pw_togglebtn = pw_new.find('.wp-hide-pw'),
             pw_generatebtn = pw_new.find('button.wp-generate-pw'),
+            pw_cancelbtn = pw_new.find('button.wp-cancel-pw'),
             pw_2 = $('.user-pass2-wrap'),
             parentform = pw_new.closest('form'),
@@ -15 +16 @@
             pw_checkbox = $('.pw-checkbox'),
             pw_weak = $('.pw-weak'),
+            pw_update_lock = false,
             // Set up a text version of the password input
             newField = document.createElement( 'input');
+
             newField.type = 'text';
 
@@ -57 +60 @@
 
         parentform.on('submit', function(){
+            pw_update_lock = false;
             pw_field2.val( pw_field.val() );
             pwWrapper.removeClass( 'show-password' );
@@ -111 +115 @@
 
         pw_new.on( 'click', 'button.wp-generate-pw', function(){
+            pw_update_lock = true;
             pw_generatebtn.hide();
             pw_line.show();
@@ -120 +125 @@
                 }
             }, 0 );
-
-        });
-
+        });
+
+        pw_submitbtn_edit.on( 'click', function() {
+            pw_update_lock = false;
+        });
+
+        pw_cancelbtn.on( 'click', function() {
+            pw_update_lock = false;
+            pw_generatebtn.show();
+            pw_line.hide();
+        });
 
         pw_togglebtn.on( 'click', function() {
@@ -146 +159 @@
 
         });
+
+        /* Warn the user if password was generated but not saved */
+        $( window ).on( 'beforeunload', function() {
+            if ( true === pw_update_lock ) {
+                return userProfileL10n.warn;
+            }
+        } );
     });
 

trunk/src/wp-admin/user-edit.php

@@ -469 +469 @@
                 <span class="dashicons dashicons-visibility"></span>
                 <span class="text"><?php _e( 'Hide' ); ?></span>
+            </button>
+            <button type="button" class="button button-secondary wp-cancel-pw hide-if-no-js" data-toggle="0" aria-label="<?php esc_attr_e( 'Cancel password change' ); ?>">
+                <span class="text"><?php _e( 'Cancel' ); ?></span>
             </button>
             <div style="display:none" id="pass-strength-result" aria-live="polite"></div>

trunk/src/wp-admin/user-new.php

@@ -408 +408 @@
                     <span class="text"><?php _e( 'Hide' ); ?></span>
                 </button>
+                <button type="button" class="button button-secondary wp-cancel-pw hide-if-no-js" data-toggle="0" aria-label="<?php esc_attr_e( 'Cancel password change' ); ?>">
+                    <span class="text"><?php _e( 'Cancel' ); ?></span>
+                </button>
                 <div style="display:none" id="pass-strength-result" aria-live="polite"></div>
             </div>

trunk/src/wp-includes/script-loader.php

@@ -375 +375 @@
     $scripts->add( 'user-profile', "/wp-admin/js/user-profile$suffix.js", array( 'jquery', 'password-strength-meter', 'wp-util' ), false, 1 );
     did_action( 'init' ) && $scripts->localize( 'user-profile', 'userProfileL10n', array(
-        'show' => __( 'Show' ),
-        'hide' => __( 'Hide' ),
+        'warn'     => __( 'Your new password has not been saved.' ),
+        'show'     => __( 'Show' ),
+        'hide'     => __( 'Hide' ),
+        'cancel'   => __( 'Cancel' ),
         'ariaShow' => esc_attr__( 'Show password' ),
         'ariaHide' => esc_attr__( 'Hide password' ),