summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortv <tv@nomic.retiolum>2013-11-06 16:04:09 +0100
committertv <tv@nomic.retiolum>2013-11-06 16:04:09 +0100
commit2a5016b8d705dba4f0689882a04037381cb4374f (patch)
treef2e877e1b6615456a2d30da31cd846196267ff2c
parentc12eb1a354eff6b965db5f4938b35e304784cb97 (diff)
parent7cbc22526a141801b7386385a87bcbf48b5c5c88 (diff)
Merge branch 'master' of https://github.com/krebscode/painload
-rw-r--r--webchat/hello_web.js5
-rw-r--r--webchat/package.json3
2 files changed, 5 insertions, 3 deletions
diff --git a/webchat/hello_web.js b/webchat/hello_web.js
index 155a34f3..e1f8f312 100644
--- a/webchat/hello_web.js
+++ b/webchat/hello_web.js
@@ -24,7 +24,8 @@ var irc_client = new irc.Client('irc.freenode.net', 'kweb', {
showErrors: true,
port: 6697,
autoRejoin: true,
- autoConnect: true
+ autoConnect: true,
+ stripColors: true
});
var reconnect = function() {
@@ -88,7 +89,7 @@ var app = connect()
res.write('<script src="jquery-2.0.3.min.js"></script>');
res.write('<script src="client.js"></script>');
res.write(krebsimage+'<br>');
- res.write('hello, this is result:<br>');
+ res.write('hello, this is #krebs:<br>');
res.write('<table id="chatbox"></table>');
res.end('<input type="text" id="input"><br>');
diff --git a/webchat/package.json b/webchat/package.json
index cb264a8c..1a9ad47d 100644
--- a/webchat/package.json
+++ b/webchat/package.json
@@ -4,7 +4,8 @@
"dependencies": {
"connect": "2.11.0",
"irc": "0.3.6",
- "sockjs": "0.3.8"
+ "sockjs": "0.3.8",
+ "redis": "0.9.0"
},
"scripts": {
"test": "tap test/*.js"