diff -r 346c88efed21 -r 5e2f62d02dcd wp/wp-admin/js/user-profile.js --- a/wp/wp-admin/js/user-profile.js Mon Jun 08 16:11:51 2015 +0000 +++ b/wp/wp-admin/js/user-profile.js Tue Jun 09 03:35:32 2015 +0200 @@ -1,7 +1,8 @@ +/* global ajaxurl, pwsL10n */ (function($){ function check_pass_strength() { - var pass1 = $('#pass1').val(), user = $('#user_login').val(), pass2 = $('#pass2').val(), strength; + var pass1 = $('#pass1').val(), pass2 = $('#pass2').val(), strength; $('#pass-strength-result').removeClass('short bad good strong'); if ( ! pass1 ) { @@ -13,16 +14,16 @@ switch ( strength ) { case 2: - $('#pass-strength-result').addClass('bad').html( pwsL10n['bad'] ); + $('#pass-strength-result').addClass('bad').html( pwsL10n.bad ); break; case 3: - $('#pass-strength-result').addClass('good').html( pwsL10n['good'] ); + $('#pass-strength-result').addClass('good').html( pwsL10n.good ); break; case 4: - $('#pass-strength-result').addClass('strong').html( pwsL10n['strong'] ); + $('#pass-strength-result').addClass('strong').html( pwsL10n.strong ); break; case 5: - $('#pass-strength-result').addClass('short').html( pwsL10n['mismatch'] ); + $('#pass-strength-result').addClass('short').html( pwsL10n.mismatch ); break; default: $('#pass-strength-result').addClass('short').html( pwsL10n['short'] ); @@ -30,10 +31,11 @@ } $(document).ready( function() { - var select = $('#display_name'); + var $colorpicker, $stylesheet, user_id, current_user_id, + select = $( '#display_name' ); - $('#pass1').val('').keyup( check_pass_strength ); - $('#pass2').val('').keyup( check_pass_strength ); + $('#pass1').val('').on( 'input propertychange', check_pass_strength ); + $('#pass2').val('').on( 'input propertychange', check_pass_strength ); $('#pass-strength-result').show(); $('.color-palette').click( function() { $(this).siblings('input[name="admin_color"]').prop('checked', true); @@ -50,8 +52,8 @@ }; if ( inputs.display_firstname && inputs.display_lastname ) { - inputs['display_firstlast'] = inputs.display_firstname + ' ' + inputs.display_lastname; - inputs['display_lastfirst'] = inputs.display_lastname + ' ' + inputs.display_firstname; + inputs.display_firstlast = inputs.display_firstname + ' ' + inputs.display_lastname; + inputs.display_lastfirst = inputs.display_lastname + ' ' + inputs.display_firstname; } $.each( $('option', select), function( i, el ){ @@ -59,12 +61,13 @@ }); $.each(inputs, function( id, value ) { - if ( ! value ) + if ( ! value ) { return; + } var val = value.replace(/<\/?[a-z][^>]*>/gi, ''); - if ( inputs[id].length && $.inArray( val, dub ) == -1 ) { + if ( inputs[id].length && $.inArray( val, dub ) === -1 ) { dub.push(val); $('