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

Merge 44878bc0a3 into a42b2440ba

Browse source
This commit is contained in:
Mark Holmquist 2012-08-12 08:52:42 -07:00
commit e25454aea5
1 changed files with 2 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/static/js/collab_client.js
View file

@ -21,6 +21,7 @@
*/
var chat = require('./chat').chat;
var hooks = require('./pluginfw/hooks');
// Dependency fill on init. This exists for `pad.socket` only.
// TODO: bind directly to the socket.
@ -337,6 +338,7 @@ function getCollabClient(ace2editor, serverVars, initialUserInfo, options, _pad)
{
callbacks.onServerMessage(msg.payload);
}
hooks.callAll('handleClientMessage_' + msg.type, {payload: msg.payload});
}
function updateUserInfo(userInfo)