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

Move the userlist code in a separate file

Browse Source
This commit is contained in:
yflory
2017-05-05 15:47:46 +02:00
parent 5a5b02b82b
commit 6847906ac9
6 changed files with 120 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
www/common/toolbar2.js
View File

@@ -121,16 +121,15 @@ define([
// Display only one time each user (if he is connected in multiple tabs)
var myUid = userData[userNetfluxId] ? userData[userNetfluxId].uid : undefined;
var uids = [];
userList.forEach(function(user) {
if(user !== userNetfluxId) {
if (user !== userNetfluxId) {
var data = userData[user] || {};
var userName = data.name;
var userId = data.uid;
if (userName && uids.indexOf(userId) === -1 && (!myUid || userId !== myUid)) {
uids.push(userId);
list.push(userName);
} else { i++; }
} else if (userName) { i++; }
}
});
return {
@@ -674,7 +673,7 @@ define([
}
Cryptpad.createUserAdminMenu(userMenuCfg);
var $userButton = $userAdmin.find('a.' + USERBUTTON_CLS);
var $userButton = toolbar.$userNameButton = $userAdmin.find('a.' + USERBUTTON_CLS);
$userButton.click(function (e) {
e.preventDefault();
e.stopPropagation();