IntenseWebs/WordPress
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't display empty values in the user display name drop-down, props Simek, fix js to add newly entered First Name and Last Name, fixes #9813

Browse Source 
git-svn-id: http://svn.automattic.com/wordpress/trunk@11330 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
azaozz
2009-05-14 17:01:04 +00:00
parent 1f1a333449
commit fc488172cc
8 changed files with 99 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
wp-admin/js/common.dev.js
View File

@@ -247,11 +247,11 @@ jQuery(document).ready( function($) {
gf = new GearsFactory();
} else {
try {
gf = new ActiveXObject('Gears.Factory');
if ( factory.getBuildInfo().indexOf('ie_mobile') != -1 )
gf.privateSetGlobalObject(this);
} catch (e) {
if ( ( 'undefined' != typeof navigator.mimeTypes ) && navigator.mimeTypes['application/x-googlegears'] ) {
if ( window.ActiveXObject ) {
gf = new ActiveXObject('Gears.Factory');
if ( gf && gf.getBuildInfo().indexOf('ie_mobile') != -1 )
gf.privateSetGlobalObject(this);
} else if ( ( 'undefined' != typeof navigator.mimeTypes ) && navigator.mimeTypes['application/x-googlegears'] ) {
gf = document.createElement("object");
gf.style.display = "none";
gf.width = 0;
@@ -259,7 +259,7 @@ jQuery(document).ready( function($) {
gf.type = "application/x-googlegears";
document.documentElement.appendChild(gf);
}
}
} catch(e){}
}
if ( gf && gf.hasPermission )
return;

2
wp-admin/js/common.js
View File

File diff suppressed because one or more lines are too long

52
wp-admin/js/user-profile.dev.js Normal file
View File

@@ -0,0 +1,52 @@
(function($){
function check_pass_strength() {
var pass = $('#pass1').val(), user = $('#user_login').val(), strength;
$('#pass-strength-result').removeClass('short bad good strong');
if ( ! pass ) {
$('#pass-strength-result').html( pwsL10n.empty );
return;
}
strength = passwordStrength(pass, user);
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;
default:
$('#pass-strength-result').addClass('short').html( pwsL10n['short'] );
}
}
$(document).ready( function() {
$('#pass1').val('').keyup( check_pass_strength );
$('.color-palette').click(function(){$(this).siblings('input[name=admin_color]').attr('checked', 'checked')});
$('#nickname').blur(function(){
var str = $(this).val() || $('#user_login').val();
$('#display_name #display_nickname').val(str).html(str);
});
$('#first_name, #last_name').blur(function(){
var first = $('#first_name').val(), last = $('#last_name').val();
$('#display_firstname, #display_lastname, #display_firstlast, #display_lastfirst').remove();
if ( first && last ) {
$('#display_name').append('<option id="display_firstname" value="' + first + '">' + first + '</option>' +
'<option id="display_lastname" value="' + last + '">' + last + '</option>' +
'<option id="display_firstlast" value="' + first + ' ' + last + '">' + first + ' ' + last + '</option>' +
'<option id="display_lastfirst" value="' + last + ' ' + first + '">' + last + ' ' + first + '</option>');
} else if ( first && !last ) {
$('#display_name').append('<option id="display_firstname" value="' + first + '">' + first + '</option>');
} else if ( !first && last ) {
$('#display_name').append('<option id="display_lastname" value="' + last + '">' + last + '</option>');
}
});
});
})(jQuery);

1
wp-admin/js/user-profile.js Normal file
View File

@@ -0,0 +1 @@
(function(a){function b(){var d=a("#pass1").val(),c=a("#user_login").val(),e;a("#pass-strength-result").removeClass("short bad good strong");if(!d){a("#pass-strength-result").html(pwsL10n.empty);return}e=passwordStrength(d,c);switch(e){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;default:a("#pass-strength-result").addClass("short").html(pwsL10n["short"])}}a(document).ready(function(){a("#pass1").val("").keyup(b);a(".color-palette").click(function(){a(this).siblings("input[name=admin_color]").attr("checked","checked")});a("#nickname").blur(function(){var c=a(this).val()||a("#user_login").val();a("#display_name #display_nickname").val(c).html(c)});a("#first_name, #last_name").blur(function(){var d=a("#first_name").val(),c=a("#last_name").val();a("#display_firstname, #display_lastname, #display_firstlast, #display_lastfirst").remove();if(d&&c){a("#display_name").append('<option id="display_firstname" value="'+d+'">'+d+'</option><option id="display_lastname" value="'+c+'">'+c+'</option><option id="display_firstlast" value="'+d+" "+c+'">'+d+" "+c+'</option><option id="display_lastfirst" value="'+c+" "+d+'">'+c+" "+d+"</option>")}else{if(d&&!c){a("#display_name").append('<option id="display_firstname" value="'+d+'">'+d+"</option>")}else{if(!d&&c){a("#display_name").append('<option id="display_lastname" value="'+c+'">'+c+"</option>")}}}})})})(jQuery);