Changeset 15998

Timestamp:

10/27/2010 06:39:20 AM (13 years ago)

Author:

westi

Message:

Bring back a seperate js file for the password strength meter and correctly mark it as a dependancy of the user profile code. See #5919.

Location:

trunk

Files:

• wp-admin/install.php (modified) (1 diff)
• wp-admin/js/password-strength-meter.dev.js (copied) (copied from trunk/wp-admin/js/password-strength-meter.dev.js)
• wp-admin/js/password-strength-meter.js (copied) (copied from trunk/wp-admin/js/password-strength-meter.js)
• wp-admin/js/user-profile.dev.js (modified) (1 diff)
• wp-admin/js/user-profile.js (modified) (1 diff)
• wp-includes/script-loader.php (modified) (2 diffs)
• wp-login.php (modified) (1 diff)

trunk/wp-admin/install.php

@@ -245 +245 @@
 <script type="text/javascript">var t = document.getElementById('weblog_title'); if (t){ t.focus(); }</script>
 <script type="text/javascript" src="../wp-includes/js/jquery/jquery.js"></script>
+<script type="text/javascript" src="js/password-strength-meter.js"></script>
 <script type="text/javascript" src="js/user-profile.js"></script>
 <script type="text/javascript" src="js/utils.js"></script>

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

@@ -1 +1 @@
 (function($){
-
-    function passwordStrength(password1, username, password2) {
-        var shortPass = 1, badPass = 2, goodPass = 3, strongPass = 4, mismatch = 5, symbolSize = 0, natLog, score;
-
-        // password 1 != password 2
-        if ( (password1 != password2) && password2.length > 0)
-            return mismatch
-
-        //password < 4
-        if ( password1.length < 4 )
-            return shortPass
-
-        //password1 == username
-        if ( password1.toLowerCase() == username.toLowerCase() )
-            return badPass;
-
-        if ( password1.match(/[0-9]/) )
-            symbolSize +=10;
-        if ( password1.match(/[a-z]/) )
-            symbolSize +=26;
-        if ( password1.match(/[A-Z]/) )
-            symbolSize +=26;
-        if ( password1.match(/[^a-zA-Z0-9]/) )
-            symbolSize +=31;
-
-        natLog = Math.log( Math.pow(symbolSize, password1.length) );
-        score = natLog / Math.LN2;
-
-        if (score < 40 )
-            return badPass
-
-        if (score < 56 )
-            return goodPass
-
-        return strongPass;
-    }
 
     function check_pass_strength() {

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

@@ -1 @@
-(function(b){function a(i,l,g){var n=1,k=2,e=3,d=4,f=5,j=0,m,h;if((i!=g)&&g.length>0){return f}if(i.length<4){return n}if(i.toLowerCase()==l.toLowerCase()){return k}if(i.match(/[0-9]/)){j+=10}if(i.match(/[a-z]/)){j+=26}if(i.match(/[A-Z]/)){j+=26}if(i.match(/[^a-zA-Z0-9]/)){j+=31}m=Math.log(Math.pow(j,i.length));h=m/Math.LN2;if(h<40){return k}if(h<56){return e}return d}function c(){var f=b("#pass1").val(),e=b("#user_login").val(),d=b("#pass2").val(),g;b("#pass-strength-result").removeClass("short bad good strong");if(!f){b("#pass-strength-result").html(pwsL10n.empty);return}g=a(f,e,d);switch(g){case 2:b("#pass-strength-result").addClass("bad").html(pwsL10n.bad);break;case 3:b("#pass-strength-result").addClass("good").html(pwsL10n.good);break;case 4:b("#pass-strength-result").addClass("strong").html(pwsL10n.strong);break;case 5:b("#pass-strength-result").addClass("short").html(pwsL10n.mismatch);break;default:b("#pass-strength-result").addClass("short").html(pwsL10n["short"])}}b(document).ready(function(){b("#pass1").val("").keyup(c);b("#pass2").val("").keyup(c);b("#pass-strength-result").show();b(".color-palette").click(function(){b(this).siblings("input[name=admin_color]").attr("checked","checked")});b("#nickname").blur(function(){var f=b(this).val()||b("#user_login").val();var d=b("#display_name");var e=d.children("option:selected").attr("id");d.children("#display_nickname").remove();if(!d.children("option[value="+f+"]").length){d.append('<option id="display_nickname" value="'+f+'">'+f+"</option>")}b("#"+e).attr("selected","selected")});b("#first_name, #last_name").blur(function(){var d=b("#display_name");var g=b("#first_name").val(),e=b("#last_name").val();var f=d.children("option:selected").attr("id");b("#display_firstname, #display_lastname, #display_firstlast, #display_lastfirst").remove();if(g&&!d.children("option[value="+g+"]").length){d.append('<option id="display_firstname" value="'+g+'">'+g+"</option>")}if(e&&!d.children("option[value="+e+"]").length){d.append('<option id="display_lastname" value="'+e+'">'+e+"</option>")}if(g&&e){if(!d.children("option[value="+g+" "+e+"]").length){d.append('<option id="display_firstlast" value="'+g+" "+e+'">'+g+" "+e+"</option>")}if(!d.children("option[value="+e+" "+g+"]").length){d.append('<option id="display_lastfirst" value="'+e+" "+g+'">'+e+" "+g+"</option>")}}b("#"+f).attr("selected","selected")})})})(jQuery);
+(function($){function check_pass_strength(){var pass1=$("#pass1").val(),user=$("#user_login").val(),pass2=$("#pass2").val(),strength;$("#pass-strength-result").removeClass("short bad good strong");if(!pass1){$("#pass-strength-result").html(pwsL10n.empty);return}strength=passwordStrength(pass1,user,pass2);switch(strength){case 2:$("#pass-strength-result").addClass("bad").html(pwsL10n.bad);break;case 3:$("#pass-strength-result").addClass("good").html(pwsL10n.good);break;case 4:$("#pass-strength-result").addClass("strong").html(pwsL10n.strong);break;case 5:$("#pass-strength-result").addClass("short").html(pwsL10n.mismatch);break;default:$("#pass-strength-result").addClass("short").html(pwsL10n["short"])}}$(document).ready(function(){$("#pass1").val("").keyup(check_pass_strength);$("#pass2").val("").keyup(check_pass_strength);$("#pass-strength-result").show();$(".color-palette").click(function(){$(this).siblings("input[name=admin_color]").attr("checked","checked")});$("#nickname").blur(function(){var str=$(this).val()||$("#user_login").val();var select=$("#display_name");var sel=select.children("option:selected").attr("id");select.children("#display_nickname").remove();if(!select.children("option[value="+str+"]").length){select.append('<option id="display_nickname" value="'+str+'">'+str+"</option>")}$("#"+sel).attr("selected","selected")});$("#first_name, #last_name").blur(function(){var select=$("#display_name");var first=$("#first_name").val(),last=$("#last_name").val();var sel=select.children("option:selected").attr("id");$("#display_firstname, #display_lastname, #display_firstlast, #display_lastfirst").remove();if(first&&!select.children("option[value="+first+"]").length){select.append('<option id="display_firstname" value="'+first+'">'+first+"</option>")}if(last&&!select.children("option[value="+last+"]").length){select.append('<option id="display_lastname" value="'+last+'">'+last+"</option>")}if(first&&last){if(!select.children("option[value="+first+" "+last+"]").length){select.append('<option id="display_firstlast" value="'+first+" "+last+'">'+first+" "+last+"</option>")}if(!select.children("option[value="+last+" "+first+"]").length){select.append('<option id="display_lastfirst" value="'+last+" "+first+'">'+last+" "+first+"</option>")}}$("#"+sel).attr("selected","selected")})})})(jQuery);

trunk/wp-includes/script-loader.php

@@ -263 +263 @@
         $scripts->add_data( 'admin-custom-fields', 'group', 1 );
 
-        $scripts->add( 'user-profile', "/wp-admin/js/user-profile$suffix.js", array('jquery'), '20101012' );
-        $scripts->add_data( 'user-profile', 'group', 1 );
-        $scripts->localize( 'user-profile', 'pwsL10n', array(
+        $scripts->add( 'password-strength-meter', "/wp-admin/js/password-strength-meter$suffix.js", array('jquery'), '20101027' );
+        $scripts->add_data( 'password-strength-meter', 'group', 1 );
+        $scripts->localize( 'password-strength-meter', 'pwsL10n', array(
             'empty' => __('Strength indicator'),
             'short' => __('Very weak'),
@@ -275 +275 @@
             'l10n_print_after' => 'try{convertEntities(pwsL10n);}catch(e){};'
         ) );
+
+        $scripts->add( 'user-profile', "/wp-admin/js/user-profile$suffix.js", array( 'jquery', 'password-strength-meter' ), '20100925' );
+        $scripts->add_data( 'user-profile', 'group', 1 );
 
         $scripts->add( 'admin-comments', "/wp-admin/js/edit-comments$suffix.js", array('wp-lists', 'list-table', 'jquery-ui-resizable', 'quicktags'), '20100818' );

trunk/wp-login.php

@@ -342 +342 @@
     $suffix = defined('SCRIPT_DEBUG') && SCRIPT_DEBUG ? '.dev' : '';
 
-    wp_enqueue_script( 'user-profile', $guessurl . "/wp-admin/js/user-profile$suffix.js", array('jquery'), '20100331' );
-    wp_localize_script( 'user-profile', 'pwsL10n', array(
+    wp_enqueue_script( 'user-profile', $guessurl . "/wp-admin/js/user-profile$suffix.js", array( 'jquery', 'password-strength-meter' ), '20100925' );
+    wp_enqueue_script( 'password-strength-meter', $guessurl . "/wp-admin/js/password-strength-meter$suffix.js", array('jquery'), '20101027' );
+    wp_localize_script( 'password-strength-meter', 'pwsL10n', array(
         'empty' => __('Strength indicator'),
         'short' => __('Very weak'),