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

Fix display name in useradmin (friends app)

Browse Source
This commit is contained in:
yflory 2017-07-10 13:02:15 +02:00
parent e6188bfb63
commit 438e7e6cf9
2 changed files with 33 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
www/common/common-userlist.js
View File

@ -56,14 +56,15 @@ define(function () {
edPublic: Cryptpad.getProxy().edPublic edPublic: Cryptpad.getProxy().edPublic
}; };
addToUserData(myData); addToUserData(myData);
Cryptpad.setAttribute('username', exp.myUserName, function (err) { /*Cryptpad.setAttribute('username', exp.myUserName, function (err) {
if (err) { if (err) {
console.log("Couldn't set username"); console.log("Couldn't set username");
console.error(err); console.error(err);
return; return;
} }
if (typeof cb === "function") { cb(); } if (typeof cb === "function") { cb(); }
}); });*/
if (typeof cb === "function") { cb(); }
}; };
exp.getLastName = function ($changeNameButton, isNew) { exp.getLastName = function ($changeNameButton, isNew) {

48
www/common/toolbar2.js
View File

@ -166,6 +166,24 @@ define([
return $.inArray(i, b) > -1; return $.inArray(i, b) > -1;
}); });
}; };
var updateDisplayName = function (toolbar, config) {
// Change username in useradmin dropdown
var name = Cryptpad.getDisplayName();
if (config.displayed.indexOf('useradmin') !== -1) {
var $userAdminElement = toolbar.$userAdmin;
var $userElement = $userAdminElement.find('.' + USERNAME_CLS);
$userElement.show();
if (config.readOnly === 1) {
$userElement.addClass(READONLY_CLS).text(Messages.readonly);
}
else {
if (!name) {
name = Messages.anonymous;
}
$userElement.removeClass(READONLY_CLS).text(name);
}
}
};
var avatars = {}; var avatars = {};
var updateUserList = function (toolbar, config) { var updateUserList = function (toolbar, config) {
// Make sure the elements are displayed // Make sure the elements are displayed
@ -174,7 +192,6 @@ define([
var userList = config.userList.list.users; var userList = config.userList.list.users;
var userData = config.userList.data; var userData = config.userList.data;
var userNetfluxId = config.userList.userNetfluxId;
var numberOfUsers = userList.length; var numberOfUsers = userList.length;
@ -256,22 +273,7 @@ define([
var $spansmall = $('<span>').html(fa_editusers + ' ' + numberOfEditUsers + '&nbsp;&nbsp; ' + fa_viewusers + ' ' + numberOfViewUsers); var $spansmall = $('<span>').html(fa_editusers + ' ' + numberOfEditUsers + '&nbsp;&nbsp; ' + fa_viewusers + ' ' + numberOfViewUsers);
$userButtons.find('.buttonTitle').html('').append($spansmall); $userButtons.find('.buttonTitle').html('').append($spansmall);
// Change username in useradmin dropdown updateDisplayName(toolbar, config);
if (config.displayed.indexOf('useradmin') !== -1) {
var $userAdminElement = toolbar.$userAdmin;
var $userElement = $userAdminElement.find('.' + USERNAME_CLS);
$userElement.show();
if (config.readOnly === 1) {
$userElement.addClass(READONLY_CLS).text(Messages.readonly);
}
else {
var name = userData[userNetfluxId] && userData[userNetfluxId].name;
if (!name) {
name = Messages.anonymous;
}
$userElement.removeClass(READONLY_CLS).text(name);
}
}
}; };
var initUserList = function (toolbar, config) { var initUserList = function (toolbar, config) {
@ -815,7 +817,15 @@ define([
if (newName === null && typeof(lastName) === "string") { return; } if (newName === null && typeof(lastName) === "string") { return; }
if (newName === null) { newName = ''; } if (newName === null) { newName = ''; }
else { Cryptpad.feedback('NAME_CHANGED'); } else { Cryptpad.feedback('NAME_CHANGED'); }
Cryptpad.changeDisplayName(newName, true); Cryptpad.setAttribute('username', newName, function (err) {
if (err) {
console.log("Couldn't set username");
console.error(err);
return;
}
updateDisplayName(toolbar, config);
Cryptpad.changeDisplayName(newName, true);
});
}); });
}); });
}); });
@ -823,6 +833,8 @@ define([
Cryptpad.findCancelButton().click(); Cryptpad.findCancelButton().click();
}); });
updateDisplayName(toolbar, config);
return $userAdmin; return $userAdmin;
}; };