Skip to content

Commit 9107ce7

Browse files
committed
Toolbar: Undo partial changes to user menu
Reverts r64502, which was missing some files for some reason. Follow-up to r64502. See #66222. Built from https://develop.svn.wordpress.org/trunk@64504 git-svn-id: http://core.svn.wordpress.org/trunk@63654 1a063a9b-81f0-0310-95a4-ce76da25c4cd
1 parent 8478919 commit 9107ce7

3 files changed

Lines changed: 6 additions & 15 deletions

File tree

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

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -494,14 +494,9 @@
494494

495495
$( function() {
496496
var $colorpicker, $stylesheet, user_id, current_user_id,
497-
select = $( '#display_name' ),
498-
username = $( '#user_login' ).val(),
499-
myAccount = $( '#wp-admin-bar-my-account' ),
500-
displayNames = myAccount.find( '.user-display-name' ),
501-
usernameLine = myAccount.find( '#wp-admin-bar-user-info .username' ),
502-
menus = myAccount.children( '.ab-sub-wrapper' ).children( '[role="menu"]' ).filter( function() {
503-
return this.getAttribute( 'aria-label' ) === displayNames.first().text();
504-
} );
497+
select = $( '#display_name' ),
498+
username = $( '#user_login' ).val(),
499+
greeting = $( '#wp-admin-bar-my-account' ).find( '.display-name' );
505500

506501
$( '#pass1' ).val( '' ).on( 'input' + ' pwupdate', check_pass_strength );
507502
$('#pass-strength-result').show();
@@ -554,11 +549,7 @@
554549

555550
var display_name = this.value.trim() || username;
556551

557-
displayNames.text( display_name );
558-
menus.attr( 'aria-label', display_name );
559-
560-
// Only show the username when it differs from the display name.
561-
usernameLine.prop( 'hidden', display_name === username );
552+
greeting.text( display_name );
562553
} );
563554
}
564555

‎wp-admin/js/user-profile.min.js‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎wp-includes/version.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
*
1717
* @global string $wp_version
1818
*/
19-
$wp_version = '7.2-alpha-64503';
19+
$wp_version = '7.2-alpha-64504';
2020

2121
/**
2222
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.

0 commit comments

Comments
 (0)