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

Merge branch 'custom-obj-msg' of github.com:ether/etherpad-lite into develop

pull/1697/head
John McLear 2013-03-21 18:49:03 -07:00
parent 1bf9d53f6a a9bd081a44
commit 2c34f6673c
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -192,7 +192,6 @@ exports.handleMessage = function(client, message)
handleSuggestUserName(client, message); handleSuggestUserName(client, message);
} else { } else {
messageLogger.warn("Dropped message, unknown COLLABROOM Data Type " + message.data.type); messageLogger.warn("Dropped message, unknown COLLABROOM Data Type " + message.data.type);
console.warn(message);
} }
} else { } else {
messageLogger.warn("Dropped message, unknown Message Type " + message.type); messageLogger.warn("Dropped message, unknown Message Type " + message.type);
@ -255,7 +254,8 @@ function handleSaveRevisionMessage(client, message){
} }
/** /**
* Handles a custom message, different to the function below as it handles objects not strings and you can direct the message to specific sessionID * Handles a custom message, different to the function below as it handles objects not strings and you can
* direct the message to specific sessionID
* *
* @param msg {Object} the message we're sending * @param msg {Object} the message we're sending
* @param sessionID {string} the socketIO session to which we're sending this message * @param sessionID {string} the socketIO session to which we're sending this message
@ -263,10 +263,7 @@ function handleSaveRevisionMessage(client, message){
exports.handleCustomObjectMessage = function (msg, sessionID, cb) { exports.handleCustomObjectMessage = function (msg, sessionID, cb) {
if(msg.data.type === "CUSTOM"){ if(msg.data.type === "CUSTOM"){
if(sessionID){ // If a sessionID is targeted then send directly to this sessionID if(sessionID){ // If a sessionID is targeted then send directly to this sessionID
console.warn("Sent msg", msg); socketio.sockets.socket(sessionID).json.send(msg); // send a targeted message
console.warn("to sessionID", sessionID);
// socketio.clients[sessionID].send(msg);
socketio.sockets.socket(sessionID).emit(msg); // send a targeted message
}else{ }else{
socketio.sockets.in(msg.data.padId).json.send(msg); // broadcast to all clients on this pad socketio.sockets.in(msg.data.padId).json.send(msg); // broadcast to all clients on this pad
} }