diff --git a/wp-admin/js/user-profile.js b/wp-admin/js/user-profile.js index 6a33265f54..622e09c56d 100644 --- a/wp-admin/js/user-profile.js +++ b/wp-admin/js/user-profile.js @@ -6,16 +6,25 @@ $pass1Wrap, $pass1, $pass1Text, - $pass2, - $weakRow, $weakCheckbox, - $toggleButton, $submitButtons, $submitButton, - currentPass; + currentPass, + inputEvent; + + /* + * Use feature detection to determine whether password inputs should use + * the `keyup` or `input` event. Input is preferred but lacks support + * in legacy browsers. + */ + if ( 'oninput' in document.createElement( 'input' ) ) { + inputEvent = 'input'; + } else { + inputEvent = 'keyup'; + } function generatePassword() { if ( typeof zxcvbn !== 'function' ) { @@ -47,7 +56,7 @@ .addClass( $pass1[0].className ) .data( 'pw', $pass1.data( 'pw' ) ) .val( $pass1.val() ) - .on( 'keyup', function () { + .on( inputEvent, function () { if ( $pass1Text.val() === currentPass ) { return; } @@ -62,7 +71,7 @@ generatePassword(); } - $pass1.on( 'keyup pwupdate', function () { + $pass1.on( inputEvent + ' pwupdate', function () { if ( $pass1.val() === currentPass ) { return; } @@ -165,7 +174,7 @@ * This fixes the issue by copying any changes from the hidden * pass2 field to the pass1 field, then running check_pass_strength. */ - $pass2 = $('#pass2').on( 'keyup', function () { + $pass2 = $('#pass2').on( inputEvent, function () { if ( $pass2.val().length > 0 ) { $pass1.val( $pass2.val() ); $pass2.val(''); @@ -250,7 +259,7 @@ var $colorpicker, $stylesheet, user_id, current_user_id, select = $( '#display_name' ); - $('#pass1').val('').on( 'keyup pwupdate', check_pass_strength ); + $('#pass1').val('').on( inputEvent + ' pwupdate', check_pass_strength ); $('#pass-strength-result').show(); $('.color-palette').click( function() { $(this).siblings('input[name="admin_color"]').prop('checked', true); diff --git a/wp-admin/js/user-profile.min.js b/wp-admin/js/user-profile.min.js index b37242e1f6..ebc4b0c2fd 100644 --- a/wp-admin/js/user-profile.min.js +++ b/wp-admin/js/user-profile.min.js @@ -1 +1 @@ -!function(a){function b(){"function"!=typeof zxcvbn?setTimeout(b,50):(i.val(i.data("pw")),i.trigger("pwupdate"),1!==parseInt(n.data("start-masked"),10)?h.addClass("show-password"):n.trigger("click"))}function c(){var c=a("#pass-strength-result")[0];q=i.val(),h=i.parent(),j=a('').attr({id:"pass1-text",name:"pass1-text",autocomplete:"off"}).addClass(i[0].className).data("pw",i.data("pw")).val(i.val()).on("keyup",function(){j.val()!==q&&(k.val(j.val()),i.val(j.val()).trigger("pwupdate"),q=j.val())}),i.after(j),1===parseInt(i.data("reveal"),10)&&b(),i.on("keyup pwupdate",function(){i.val()!==q&&(q=i.val(),j.val()!==q&&j.val(q),i.add(j).removeClass("short bad good strong"),c.className&&(i.add(j).addClass(c.className),"short"===c.className||"bad"===c.className?(m.prop("checked")||o.prop("disabled",!0),l.show()):(o.prop("disabled",!1),l.hide())))})}function d(){n=g.find(".wp-hide-pw"),n.show().on("click",function(){1===parseInt(n.data("toggle"),10)?(h.addClass("show-password"),n.data("toggle",0).attr({"aria-label":userProfileL10n.ariaHide}).find(".text").text(userProfileL10n.hide).end().find(".dashicons").removeClass("dashicons-visibility").addClass("dashicons-hidden"),j.focus(),_.isUndefined(j[0].setSelectionRange)||j[0].setSelectionRange(0,100)):(h.removeClass("show-password"),n.data("toggle",1).attr({"aria-label":userProfileL10n.ariaShow}).find(".text").text(userProfileL10n.show).end().find(".dashicons").removeClass("dashicons-hidden").addClass("dashicons-visibility"),i.focus(),_.isUndefined(i[0].setSelectionRange)||i[0].setSelectionRange(0,100))})}function e(){var e,f,n;g=a(".user-pass1-wrap"),a(".user-pass2-wrap").hide(),p=a("#submit").on("click",function(){r=!1}),o=p.add(" #createusersub"),l=a(".pw-weak"),m=l.find(".pw-checkbox"),m.change(function(){o.prop("disabled",!m.prop("checked"))}),i=a("#pass1"),i.length&&c(),k=a("#pass2").on("keyup",function(){k.val().length>0&&(i.val(k.val()),k.val(""),q="",i.trigger("pwupdate"))}),e=g.find(".wp-pwd").hide(),d(),f=g.find("button.wp-generate-pw").show(),f.on("click",function(){r=!0,f.hide(),e.show(),0===j.val().length&&b(),_.defer(function(){j.focus(),_.isUndefined(j[0].setSelectionRange)||j[0].setSelectionRange(0,100)},0)}),n=g.find("button.wp-cancel-pw"),n.on("click",function(){r=!1,f.show(),e.hide(),i.val("").trigger("pwupdate"),o.prop("disabled",!1)}),g.closest("form").on("submit",function(){r=!1,k.val(i.val()),h.removeClass("show-password")})}function f(){var b,c=a("#pass1").val();if(a("#pass-strength-result").removeClass("short bad good strong"),!c)return void a("#pass-strength-result").html(" ");switch(b=wp.passwordStrength.meter(c,wp.passwordStrength.userInputBlacklist(),c)){case 2:a("#pass-strength-result").addClass("bad").html(pwsL10n.bad);break;case 3:a("#pass-strength-result").addClass("good").html(pwsL10n.good);break;case 4:a("#pass-strength-result").addClass("strong").html(pwsL10n.strong);break;case 5:a("#pass-strength-result").addClass("short").html(pwsL10n.mismatch);break;default:a("#pass-strength-result").addClass("short").html(pwsL10n["short"])}}var g,h,i,j,k,l,m,n,o,p,q,r=!1;a(document).ready(function(){var b,c,d,g,h=a("#display_name");a("#pass1").val("").on("keyup pwupdate",f),a("#pass-strength-result").show(),a(".color-palette").click(function(){a(this).siblings('input[name="admin_color"]').prop("checked",!0)}),h.length&&a("#first_name, #last_name, #nickname").bind("blur.user_profile",function(){var b=[],c={display_nickname:a("#nickname").val()||"",display_username:a("#user_login").val()||"",display_firstname:a("#first_name").val()||"",display_lastname:a("#last_name").val()||""};c.display_firstname&&c.display_lastname&&(c.display_firstlast=c.display_firstname+" "+c.display_lastname,c.display_lastfirst=c.display_lastname+" "+c.display_firstname),a.each(a("option",h),function(a,c){b.push(c.value)}),a.each(c,function(d,e){if(e){var f=e.replace(/<\/?[a-z][^>]*>/gi,"");c[d].length&&-1===a.inArray(f,b)&&(b.push(f),a("