From 34872bd6259823d8738abfb7ec7f7922d3ba610e Mon Sep 17 00:00:00 2001
From: Darren <darren@darrenwhitlen.com>
Date: Sun, 18 Sep 2011 13:41:38 +0100
Subject: [PATCH] all.js content-type, keyboard events on login screen, favicon

---
 img/ico.png                 | Bin 0 -> 4294 bytes
 node/app.js                 |  10 +++++++++-
 node/client/index.html.jade |   6 ++++--
 3 files changed, 13 insertions(+), 3 deletions(-)
 create mode 100644 img/ico.png

diff --git a/img/ico.png b/img/ico.png
new file mode 100644
index 0000000000000000000000000000000000000000..82edbcb46679998b0cbe1d3f2b79973aa7947906
GIT binary patch
literal 4294
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

literal 0
HcmV?d00001

diff --git a/node/app.js b/node/app.js
index 3129061..633de39 100644
--- a/node/app.js
+++ b/node/app.js
@@ -538,6 +538,7 @@ this.httpHandler = function (request, response) {
             if (request.headers['if-none-match'] === kiwi.cache.alljs_hash) {
                 response.statusCode = 304;
             } else {
+                response.setHeader('Content-type', 'application/javascript');
                 response.setHeader('ETag', kiwi.cache.alljs_hash);
                 response.write(kiwi.cache.alljs);
             }
@@ -586,7 +587,14 @@ this.httpHandler = function (request, response) {
             }
 
             response.setHeader('X-Generated-By', 'KiwiIRC');
-            hash = crypto.createHash('md5').update(touchscreen ? 't' : 'f').update(debug ? 't' : 'f').update(server_set ? 't' : 'f').update(server).update(nick).update(agent).update(JSON.stringify(kiwi.config)).digest('base64');
+            hash = crypto.createHash('md5').update(touchscreen ? 't' : 'f')
+                                            .update(debug ? 't' : 'f')
+                                            .update(server_set ? 't' : 'f')
+                                            .update(server)
+                                            .update(nick)
+                                            .update(agent)
+                                            .update(JSON.stringify(kiwi.config))
+                                            .digest('base64');
             if (kiwi.cache.html[hash]) {
                 if (request.headers['if-none-match'] === kiwi.cache.html[hash].hash) {
                     response.statusCode = 304;
diff --git a/node/client/index.html.jade b/node/client/index.html.jade
index 2c66c67..6cf87fd 100644
--- a/node/client/index.html.jade
+++ b/node/client/index.html.jade
@@ -5,8 +5,9 @@ html(xmlns="http://www.w3.org/1999/xhtml", lang="en-gb")
         meta(http-equiv="Content-Type", content="text/html; charset=utf-8")
         - if ((agent === 'android') || (agent === 'iphone') || (agent === 'ipad') || (agent === 'ipod'))
             meta(name="viewport", content="width=device-width,user-scalable=no")
-
+        
         title Kiwi IRC
+        link(rel="shortcut icon", href="/img/ico.png")
         link(rel="stylesheet", type="text/css", href="/css/default.css")
         link(rel="stylesheet", type="text/css", href="/css/ui.css")
 
@@ -70,7 +71,8 @@ html(xmlns="http://www.w3.org/1999/xhtml", lang="en-gb")
                 }
                 $('.formconnectwindow .nick').keydown(input_submit);
                 $('.formconnectwindow .channel').keydown(input_submit);
-                $('.formconnectwindow .server').keydown(input_submit);
+                $('.formconnectwindow .network').keydown(input_submit);
+                $('.formconnectwindow .port').keydown(input_submit);
             }
 
 
-- 
2.25.1