Merge branch 'staging' into code2

This commit is contained in:
yflory
2017-08-30 14:57:19 +02:00
17 changed files with 87 additions and 67 deletions

View File

@@ -1794,12 +1794,15 @@ define([
};
var $userAdmin = createDropdown(dropdownConfigUser);
var oldUrl;
if (account && !config.static && store) {
var $avatar = $userAdmin.find('.buttonTitle');
var updateButton = function (newName) {
var profile = store.getProfile();
var url = profile && profile.avatar;
if (oldUrl === url) { return; }
oldUrl = url;
$avatar.html('');
common.displayAvatar($avatar, url, newName, function ($img) {
if ($img) {