From a3ea3127733549ce3ffd4d97d5f55c6049a00626 Mon Sep 17 00:00:00 2001
From: David Cormier <david.cormier@savoirfairelinux.com>
Date: Sun, 27 Oct 2013 12:03:45 -0400
Subject: [PATCH] doSend always doSendWithCallback

The goal of this change is to provide only one way of sending
messages. By default, a callback will always be returned, and
the caller will decide if it needs to use it.
---
 js/websockets.js | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/js/websockets.js b/js/websockets.js
index 05cdc57..847bdfc 100644
--- a/js/websockets.js
+++ b/js/websockets.js
@@ -203,12 +203,13 @@ weechat.factory('connection', ['$q', '$rootScope', '$log', '$store', 'handlers',
             cb: defer
         }
         callBackIdString = "(" + currentCallBackId + ")";
-        doSend(callBackIdString + " " + message);
         return defer;
     }
 
     var doSendWithCallback = function(message) {
+        message.replace(/[\r\n]+$/g, "").split("\n");
         var cb = createCallback(message);
+        websocket.send(callBackIdString + " " + message);
         return cb.promise;
     }
 
@@ -223,20 +224,15 @@ weechat.factory('connection', ['$q', '$rootScope', '$log', '$store', 'handlers',
     var doSendAllWithCallback = function(messages) {
         var promises = [];
         for(i in messages) {
-            var cb = createCallback(messages[i]);
-            promises.push(cb.promise);
+            var promise = doSendWithCallback(messages[i]);
+            promises.push(promise);
         };
         return $q.all(promises);
     };
 
     // Sanitizes messages to be sent to the weechat relay
     var doSend = function(message) {
-        msgs = message.replace(/[\r\n]+$/g, "").split("\n");
-        for (var i = 0; i < msgs.length; i++) {
-            $log.log('=' + msgs[i] + '=');
-            $rootScope.commands.push("SENT: " + msgs[i]);
-        }
-        websocket.send(message);
+        doSendWithCallback(message);
     }
 
     // Takes care of the connection and websocket hooks