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

8
static/js/pad_userlist.js
View file

@ -499,6 +499,12 @@ var paduserlist = (function()
},
setMyUserInfo: function(info)
{
//translate the colorId
if(typeof info.colorId == "number")
{
info.colorId = clientVars.colorPalette[info.colorId];
}
myUserInfo = $.extend(
{}, info);
@ -513,7 +519,7 @@ var paduserlist = (function()
}
var userData = {};
userData.color = info.colorId;
userData.color = typeof info.colorId == "number" ? clientVars.colorPalette[info.colorId] : info.colorId;
userData.name = info.name;
userData.status = '';
userData.activity = '';