cadey
/
Shuo
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Bugfix active channel

This commit is contained in:
Mattias Erming 2014-04-21 23:04:16 +02:00
parent 4bcc1d503a
commit 55172d40db
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
client/js/chat.js
View File

@ -75,13 +75,15 @@ $(function() {
var next = null; var next = null;
$(".window").each(function() { $(".window").each(function() {
var z = $(this).css("z-index"); var z = $(this).css("z-index");
if (z == "auto") z = 0;
if (z > highest) { if (z > highest) {
highest = z; highest = z;
next = $(this); next = $(this);
} }
}); });
if (next != null) { if (next != null) {
next.addClass("active"); $("#channel-" + next.attr("id").replace("window-", "")).addClass("active");
next.bringToTop();
} }
return; return;
} }

2
lib/server.js
View File

@ -382,10 +382,8 @@ function event(event, data) {
}); });
break; break;
} }
var name = data[1].nickname; var name = data[1].nickname;
var chan = channels.findWhere({name: name}) || channels.add({type: "query", name: name}); var chan = channels.findWhere({name: name}) || channels.add({type: "query", name: name});
var i = 0; var i = 0;
for (var k in data[1]) { for (var k in data[1]) {
if (i++ == 5) break; if (i++ == 5) break;