tobast/glowingbear-mainbox
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Remove doSend

Browse source 
Replace calls to doSend with calls to send
This commit is contained in:
David Cormier 2013-10-27 12:07:01 -04:00
parent 0f503fa521
commit 8167b25c36
1 changed files with 5 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
js/websockets.js
View file

@ -230,11 +230,6 @@ weechat.factory('connection', ['$q', '$rootScope', '$log', '$store', 'handlers',
return $q.all(promises); return $q.all(promises);
}; };
// Sanitizes messages to be sent to the weechat relay
var doSend = function(message) {
send(message);
}
// Takes care of the connection and websocket hooks // Takes care of the connection and websocket hooks
var connect = function (host, port, passwd, ssl) { var connect = function (host, port, passwd, ssl) {
var proto = ssl ? 'wss':'ws'; var proto = ssl ? 'wss':'ws';
@ -247,7 +242,7 @@ weechat.factory('connection', ['$q', '$rootScope', '$log', '$store', 'handlers',
// First message must be an init request // First message must be an init request
// with the password // with the password
doSend(weeChat.Protocol.formatInit({ send(weeChat.Protocol.formatInit({
password: passwd, password: passwd,
compression: 'off' compression: 'off'
})); }));
@ -302,7 +297,7 @@ weechat.factory('connection', ['$q', '$rootScope', '$log', '$store', 'handlers',
handlers.handleLineInfo(lineinfo); handlers.handleLineInfo(lineinfo);
handlers.handleHotlistInfo(hotlist) handlers.handleHotlistInfo(hotlist)
handlers.handleNicklist(nicklist) handlers.handleNicklist(nicklist)
doSend(weeChat.Protocol.formatSync({})); send(weeChat.Protocol.formatSync({}));
$log.info("Synced"); $log.info("Synced");
// here we are really connected ! // here we are really connected !
@ -372,14 +367,14 @@ weechat.factory('connection', ['$q', '$rootScope', '$log', '$store', 'handlers',
} }
var sendMessage = function(message) { var sendMessage = function(message) {
doSend(weeChat.Protocol.formatInput({ send(weeChat.Protocol.formatInput({
buffer: models.getActiveBuffer()['fullName'], buffer: models.getActiveBuffer()['fullName'],
data: message data: message
})); }));
} }
var sendCoreCommand = function(command) { var sendCoreCommand = function(command) {
doSend(weeChat.Protocol.formatInput({ send(weeChat.Protocol.formatInput({
buffer: 'core.weechat', buffer: 'core.weechat',
data: command data: command
})); }));
@ -387,7 +382,7 @@ weechat.factory('connection', ['$q', '$rootScope', '$log', '$store', 'handlers',
return { return {
send: doSend, send: send,
connect: connect, connect: connect,
disconnect: disconnect, disconnect: disconnect,
sendMessage: sendMessage, sendMessage: sendMessage,