web/cryptpad
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Display a dropdown menu inside another one

Browse Source
This commit is contained in:
yflory
2017-11-15 15:35:28 +01:00
parent 014e12b5b5
commit 1f53304ad3
4 changed files with 40 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
www/common/common-ui-elements.js
View File

@@ -679,9 +679,16 @@ define([
};
var $userAdmin = UIElements.createDropdown(dropdownConfigUser);
/*
// Uncomment these lines to have a language selector in the admin menu
// FIXME clicking on the inner menu hides the outer one
var $lang = UIElements.createLanguageSelector(Common);
$userAdmin.find('.cp-dropdown-content').append($lang);
*/
var $displayName = $userAdmin.find('.'+displayNameCls);
var $avatar = $userAdmin.find('.cp-dropdown-button-title');
var $avatar = $userAdmin.find('> button .cp-dropdown-button-title');
var loadingAvatar;
var to;
var oldUrl = '';
@@ -700,10 +707,11 @@ define([
$displayName.text(newName || Messages.anonymous);
if (accountName && oldUrl !== url) {
$avatar.html('');
UIElements.displayAvatar(Common, $avatar, url, newName || Messages.anonymous, function ($img) {
UIElements.displayAvatar(Common, $avatar, url,
newName || Messages.anonymous, function ($img) {
oldUrl = url;
if ($img) {
$userAdmin.find('button').addClass('cp-avatar');
$userAdmin.find('> button').addClass('cp-avatar');
}
loadingAvatar = false;
});