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 54511a6cea into 309e3b0994

Browse source
This commit is contained in:
GitHub Merge Button 2012-05-22 00:28:27 -07:00
commit bf85d600c7
1 changed files with 19 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

15
node/handler/PadMessageHandler.js
View file

@ -170,27 +170,26 @@ exports.handleMessage = function(client, message)
{ {
handleClientReady(client, message); handleClientReady(client, message);
} }
else if(message.type == "COLLABROOM" && else if(message.type == "COLLABROOM" && typeof message.data == 'object'){
message.data.type == "USER_CHANGES") if (message.data.type == "USER_CHANGES")
{ {
handleUserChanges(client, message); handleUserChanges(client, message);
} }
else if(message.type == "COLLABROOM" && else if (message.data.type == "USERINFO_UPDATE")
message.data.type == "USERINFO_UPDATE")
{ {
handleUserInfoUpdate(client, message); handleUserInfoUpdate(client, message);
} }
else if(message.type == "COLLABROOM" && else if(message.data.type == "CHAT_MESSAGE")
message.data.type == "CHAT_MESSAGE")
{ {
handleChatMessage(client, message); handleChatMessage(client, message);
} }
else if(message.type == "COLLABROOM" && else if(message.data.type == "CLIENT_MESSAGE" &&
message.data.type == "CLIENT_MESSAGE" && typeof message.data.payload == 'object' &&
message.data.payload.type == "suggestUserName") message.data.payload.type == "suggestUserName")
{ {
handleSuggestUserName(client, message); handleSuggestUserName(client, message);
} }
}
//if the message type is unknown, throw an exception //if the message type is unknown, throw an exception
else else
{ {