mirrors/etherpad-lite
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-04-20 23:46:14 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

fixed the backward compatility to old colorIds

Browse source
This commit is contained in:
Peter 'Pita' Martischka 2011-08-21 18:53:30 +01:00
parent 6c354c6333
commit 4f233d88f8
4 changed files with 14 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

6
static/js/collab_client.js
View file

@ -407,6 +407,7 @@ function getCollabClient(ace2editor, serverVars, initialUserInfo, options)
{
var userInfo = msg.userInfo;
var id = userInfo.userId;
if (userSet[id])
{
userSet[id] = userInfo;
@ -471,6 +472,11 @@ function getCollabClient(ace2editor, serverVars, initialUserInfo, options)
function tellAceAuthorInfo(userId, colorId, inactive)
{
if(typeof colorId == "number")
{
colorId = clientVars.colorPalette[colorId];
}
var cssColor = colorId;
if (inactive)
{