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

Merge 9bd23acb3d into b1123d11b6

Browse source
This commit is contained in:
GitHub Merge Button 2012-07-17 10:13:56 -07:00
commit 00d0b396f5
1 changed files with 5 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/static/js/pad_userlist.js
View file

@ -21,6 +21,7 @@
*/ */
var padutils = require('./pad_utils').padutils; var padutils = require('./pad_utils').padutils;
var hooks = require('./pluginfw/hooks');
var myUserInfo = {}; var myUserInfo = {};
@ -529,6 +530,10 @@ var paduserlist = (function()
return; return;
} }
hooks.callAll('userJoinOrUpdate', {
userInfo: info
});
var userData = {}; var userData = {};
userData.color = typeof info.colorId == "number" ? clientVars.colorPalette[info.colorId] : info.colorId; userData.color = typeof info.colorId == "number" ? clientVars.colorPalette[info.colorId] : info.colorId;
userData.name = info.name; userData.name = info.name;