From 7e0b11ebf2c798fbbfaa1251c5a807777a722ced Mon Sep 17 00:00:00 2001 From: Mattias Erming Date: Sun, 15 Jun 2014 22:36:55 +0200 Subject: [PATCH] Minor changes --- README.md | 1 + client/css/style.css | 1 + client/js/chat.js | 7 +++---- lib/models/chan.js | 1 + lib/models/network.js | 1 + 5 files changed, 7 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 7d4f88cd..47782406 100644 --- a/README.md +++ b/README.md @@ -76,6 +76,7 @@ socket.emit("join", { id: 0, name: "", type: "", + network: "", count: 0, messages: [], users: [], diff --git a/client/css/style.css b/client/css/style.css index 8d3d8efa..cf610973 100644 --- a/client/css/style.css +++ b/client/css/style.css @@ -247,6 +247,7 @@ button { max-width: 250px; } #sign-in-input { + color: #95a5a6; margin-bottom: 20px; width: 100%; } diff --git a/client/js/chat.js b/client/js/chat.js index d57cd40c..2deb13d5 100644 --- a/client/js/chat.js +++ b/client/js/chat.js @@ -66,7 +66,7 @@ $(function() { switch (e) { case "auth": chat.add($("#networks")).empty(); - $("#sign-in").addClass("active"); + $("#sign-in").addClass("active").find("#sign-in-input").focus(); break; case "debug": @@ -163,10 +163,9 @@ $(function() { .find(".badge") .removeClass("highlight") .empty(); + + $("#main .active").removeClass("active"); var window = $(target) - .siblings() - .removeClass("active") - .end() .css("z-index", z++) .addClass("active"); diff --git a/lib/models/chan.js b/lib/models/chan.js index da575cc1..7a6d3205 100644 --- a/lib/models/chan.js +++ b/lib/models/chan.js @@ -8,6 +8,7 @@ function Chan(attr) { id: global.id = ++global.id || 1, name: "", type: "channel", + network: "", count: 0, messages: [], users: [], diff --git a/lib/models/network.js b/lib/models/network.js index 0236f7ce..07f179a0 100644 --- a/lib/models/network.js +++ b/lib/models/network.js @@ -20,6 +20,7 @@ function Network(attr) { }; Network.prototype.addChan = function(chan) { + chan.network = this.host; this.channels.push(chan); };