mirrors/etherpad-lite
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-05-09 08:25:00 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Tooltip for author colors

Browse source
This commit is contained in:
Mehmet Ali Elicin 2012-04-16 00:38:39 -07:00
parent 3c8674ebde
commit 45456c2a4c
4 changed files with 24 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

14
static/js/collab_client.js
View file

@ -437,10 +437,10 @@ function getCollabClient(ace2editor, serverVars, initialUserInfo, options, _pad)
function tellAceActiveAuthorInfo(userInfo)
{
tellAceAuthorInfo(userInfo.userId, userInfo.colorId);
tellAceAuthorInfo(userInfo.userId, userInfo.colorId, false, userInfo.name);
}
function tellAceAuthorInfo(userId, colorId, inactive)
function tellAceAuthorInfo(userId, colorId, inactive, name)
{
if(typeof colorId == "number")
{
@ -452,20 +452,22 @@ function getCollabClient(ace2editor, serverVars, initialUserInfo, options, _pad)
{
editor.setAuthorInfo(userId, {
bgcolor: cssColor,
fade: 0.5
fade: 0.5,
name: name
});
}
else
{
editor.setAuthorInfo(userId, {
bgcolor: cssColor
bgcolor: cssColor,
name: name
});
}
}
function fadeAceAuthorInfo(userInfo)
{
tellAceAuthorInfo(userInfo.userId, userInfo.colorId, true);
tellAceAuthorInfo(userInfo.userId, userInfo.colorId, true, userInfo.name);
}
function getConnectedUsers()
@ -480,7 +482,7 @@ function getCollabClient(ace2editor, serverVars, initialUserInfo, options, _pad)
var data = hadata[author];
if (!userSet[author])
{
tellAceAuthorInfo(author, data.colorId, true);
tellAceAuthorInfo(author, data.colorId, true, data.name);
}
}
}