libre-service.eu/pad.libre-service.eu-etherpad
libre-service.eu/pad.libre-service.eu-etherpad
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-01-19 22:23:33 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1699 from ether/fix-custom

Browse source 
Fix custom obj msg broadcaster to pads
This commit is contained in:
John McLear 2013-04-02 15:24:42 -07:00
commit f503f28b08
1 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/node/handler/PadMessageHandler.js
View file

@ -151,7 +151,6 @@ exports.handleMessage = function(client, message)
var handleMessageHook = function(callback){ var handleMessageHook = function(callback){
var dropMessage = false; var dropMessage = false;
// Call handleMessage hook. If a plugin returns null, the message will be dropped. Note that for all messages // Call handleMessage hook. If a plugin returns null, the message will be dropped. Note that for all messages
// handleMessage will be called, even if the client is not authorized // handleMessage will be called, even if the client is not authorized
hooks.aCallAll("handleMessage", { client: client, message: message }, function ( err, messages ) { hooks.aCallAll("handleMessage", { client: client, message: message }, function ( err, messages ) {
@ -265,7 +264,7 @@ exports.handleCustomObjectMessage = function (msg, sessionID, cb) {
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
socketio.sockets.socket(sessionID).json.send(msg); // send a targeted message socketio.sockets.socket(sessionID).json.send(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.payload.padId).json.send(msg); // broadcast to all clients on this pad
} }
} }
cb(null, {}); cb(null, {});