Removing git blunders

diff --git a/README.md b/README.md
index 9026079088d89272e4d03c22e3396c2142ade190..ec69ca0956e5a55fa1c285b6aa7045588ac06b7f 100755 (executable)
--- a/README.md
+++ b/README.md
@@ -1,22 +1,24 @@
 # Installation\r
-* Get the Kiwi source and dependencies\r
 \r
-    $git clone https://github.com/prawnsalad/KiwiIRC.git\r
-    $npm install\r
+* Install the dependencies\r
+\r
+    $npm install jade\r
+\r
+    $npm install node-static\r
+\r
+    $npm install uglify-js\r
+\r
+    $npm install socket.io\r
+\r
+    $npm install socket.io-client\r
     \r
-* Create your SSL certificate and key, place it in the server folder.\r
+* If you're using SSL, create your certificate and key, place it in the server folder.\r
 \r
 * Edit the configuration file\r
 \r
     $nano server/config.json\r
     \r
 # Running \r
-Either use npm\r
-\r
-    $npm start\r
-\r
-or run node directly\r
-\r
     $node server/kiwi.js\r
 \r
 # Bugs\r

diff --git a/client/js/front.events.js b/client/js/front.events.js
index 05bca870212e2736462c20a1e49de14602cbd265..a4b67121f918a8636cae995d5fc62e52fba37ae5 100644 (file)
--- a/client/js/front.events.js
+++ b/client/js/front.events.js
@@ -595,7 +595,7 @@ kiwi.front.events = {
             break;\r
         default:\r
             // We don't know what data contains, so don't do anything with it.\r
-            //kiwi.front.tabviews.server.addMsg(null, ' ', '=== ' + data, 'status');\r
+            console.log(e, data);\r
         }\r
     },\r
 \r

diff --git a/client/js/gateway.js b/client/js/gateway.js
index 37fec1ae2a92106900fe4e94dc1c2982cb400d4d..e7a9a51026837f4804a2f3c9ccf08af3049bca5a 100644 (file)
--- a/client/js/gateway.js
+++ b/client/js/gateway.js
@@ -119,6 +119,7 @@ kiwi.gateway = {
             kiwi.gateway.socket.on('reconnect_failed', function () {
                 console.log("kiwi.gateway.socket.on('reconnect_failed')");
             });
+            kiwi.gateway.socket.on('error', console.log);
         }
     },
 

diff --git a/package.json b/package.json
deleted file mode 100644 (file)
index 2ee89f2..0000000
--- a/package.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-    "scripts": {
-        "start": "node server/kiwi.js"
-    },
-    "name": "KiwiIRC",
-    "version": "0.1.0-dev",
-    "homepage": "http://kiwiirc.com",
-    "repository" : {
-        "type" : "git",
-        "url" : "https://github.com/prawnsalad/KiwiIRC.git"
-    },
-    "dependencies": {
-        "jade": ">=0.16.2",
-        "node-static": ">=0.5.9",
-        "uglify-js": ">=1.1.1",
-        "socket.io": ">=0.8.5",
-        "socket.io-client": ">=0.8.5"
-    },
-    "private": true
-}

diff --git a/server/app.js b/server/app.js
index 36d221325d80d6bc866525caceadd8957d5bdea9..e9278e84972ebde0164a0028dbaa44af980c03de 100644 (file)
--- a/server/app.js
+++ b/server/app.js
@@ -793,6 +793,7 @@ this.websocketListen = function (servers, handler) {
             }
             callback(null, true);
         }).on('connection', kiwi.websocketConnection);
+        io.of('/kiwi').on('error', console.log);
     });
 };
 
@@ -840,6 +841,7 @@ this.websocketConnection = function (websocket) {
         });
         websocket.on('message', kiwi.websocketMessage);
         websocket.on('disconnect', kiwi.websocketDisconnect);
+        websocket.on('error', console.log);
     }
 };
 
@@ -990,6 +992,9 @@ this.IRCConnection = function (websocket, nick, host, port, ssl, password, callb
         });
         bound_events = kiwi.bindIRCCommands(that, websocket);
     };
+    
+    that.on('error', console.log);
+    
 };