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 a65dd79d05 into 4195e11a41

Browse source
This commit is contained in:
GitHub Merge Button 2012-06-21 11:36:28 -07:00
commit e9f93ed370
1 changed files with 7 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -33,6 +33,7 @@ var plugins = require("ep_etherpad-lite/static/js/pluginfw/plugins.js");
var log4js = require('log4js'); var log4js = require('log4js');
var messageLogger = log4js.getLogger("message"); var messageLogger = log4js.getLogger("message");
var _ = require('underscore'); var _ = require('underscore');
var hooks = require("ep_etherpad-lite/static/js/pluginfw/hooks.js");
/** /**
* A associative array that translates a session to a pad * A associative array that translates a session to a pad
@ -160,7 +161,12 @@ exports.handleDisconnect = function(client)
* @param message the message from the client * @param message the message from the client
*/ */
exports.handleMessage = function(client, message) exports.handleMessage = function(client, message)
{ {
_.map(hooks.callAll( "handleMessage", { client: client, message: message }), function ( newmessage ) {
if ( newmessage || newmessage === null ) {
message = newmessage;
}
});
if(message == null) if(message == null)
{ {
messageLogger.warn("Message is null!"); messageLogger.warn("Message is null!");