From: Darren <darren@darrenwhitlen.com>
Date: Fri, 17 Oct 2014 23:47:32 +0000 (+0100)
Subject: Merge branch 'promise' of https://github.com/M2Ys4U/KiwiIRC into M2Ys4U-promise
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=feafc63fbe3f7b1380a925fc79907b3191fb87bd;p=KiwiIRC.git

Merge branch 'promise' of https://github.com/M2Ys4U/KiwiIRC into M2Ys4U-promise

Conflicts:
	package.json
---

feafc63fbe3f7b1380a925fc79907b3191fb87bd
diff --cc client/assets/plugins/textstyle.html
index 4fc54ca,3567d4d..39ac9d0
--- a/client/assets/plugins/textstyle.html
+++ b/client/assets/plugins/textstyle.html
@@@ -138,8 -138,10 +138,10 @@@
  
              // Add the styles to the emssage
              if (data.params[1]) {
 -                data.params[1] = style_codes + ' ' + data.params[1];
 +                data.params[1] = style_codes + data.params[1];
              }
+ 
+             event.callback();
          });
  
  
diff --cc package.json
index 9538dac,a8b0381..d79ec21
--- a/package.json
+++ b/package.json
@@@ -15,18 -15,19 +15,19 @@@
      "postinstall": "node client/build.js"
    },
    "dependencies": {
-     "node-static": "0.7.4",
-     "uglify-js": "2.4.15",
-     "engine.io": "^1.4.0",
-     "lodash": "2.4.1",
      "daemonize2": "0.4.2",
 -    "engine.io": "1.2",
++    "engine.io": "^1.4.0",
+     "es6-promise": "^1.0.0",
 -    "eventemitter2": "0.4.13",
 -    "iconv-lite": "0.2.11",
 -    "ipaddr.js": "0.1.2",
 +    "eventemitter2": "0.4.14",
-     "ipaddr.js": "0.1.3",
-     "socksjs": "0.4.4",
 +    "iconv-lite": "0.4.4",
-     "spdy": "1.28.1",
-     "po2json": "0.3.0",
++    "ipaddr.js": "0.1.3",
+     "lodash": "2.4.1",
      "negotiator": "0.4.3",
 -    "node-static": "0.7.3",
 -    "po2json": "0.2.3",
++    "node-static": "0.7.4",
++    "po2json": "0.3.0",
+     "socksjs": "0.4.4",
+     "spdy": "1.19.1",
+     "uglify-js": "2.4.12",
      "winston": "~0.7.2"
    },
    "engines": {