public-offering
/
pad.pub0.org
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #724 from fourplusone/fix/fix-722-develop 

fix #722 in the develop branch
pull/735/head
John McLear 2012-05-22 05:31:25 -07:00
parent 185a3bface 06c36f3023
commit c30d2fde96
1 changed files with 19 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/node/handler/PadMessageHandler.js
View File

@ -177,31 +177,25 @@ 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.data.type == "CHAT_MESSAGE")
else if(message.type == "COLLABROOM" && {
message.data.type == "CHAT_MESSAGE") handleChatMessage(client, message);
{ }
handleChatMessage(client, message); else if(message.data.type == "CLIENT_MESSAGE" &&
} typeof message.data.payload == 'object' &&
else if(message.type == "COLLABROOM" && message.data.payload.type == "suggestUserName")
message.data.type == "SAVE_REVISION") {
{ handleSuggestUserName(client, message);
handleSaveRevisionMessage(client, message); }
}
else if(message.type == "COLLABROOM" &&
message.data.type == "CLIENT_MESSAGE" &&
message.data.payload.type == "suggestUserName")
{
handleSuggestUserName(client, message);
} }
//if the message type is unknown, throw an exception //if the message type is unknown, throw an exception
else else