Mirrors/thelounge
2
0
Fork 0
mirror of https://github.com/thelounge/thelounge synced 2024-11-25 05:20:21 +00:00
Code Issues Projects Releases Packages Wiki Activity

Focus windows on refresh

Browse source
This commit is contained in:
Mattias Erming 2014-03-06 11:31:06 -08:00
parent b45a3e09fd
commit 3acb7402be
2 changed files with 26 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
client/js/chat.js
View file

@ -20,24 +20,37 @@ $(function() {
var View = {};
View.refresh = function(event) {
chat.html("");
event.data.forEach(function(network) {
chat.append(Mustache.render(channels, network, {
users: users,
messages: messages
}));
});
chat.find(".messages").scrollToBottom();
var data = event.data;
sidebar.html(
Mustache.render(networks, {
networks: event.data
networks: data
})
);
chat.html("");
var partials = {
users: users,
messages: messages
};
data.forEach(function(network) {
chat.append(Mustache.render(channels, network, partials));
});
chat.find(".messages").scrollToBottom();
chat.find(".window")
// Sort windows by `data-id` value.
.sort(function(a, b) { return ($(a).data("id") - $(b).data("id")); })
.last()
.bringToTop()
.find(".input")
.focus();
};
View.add = function(event) {
var target = "";
var render = "";
switch (event.type) {
case "user":
target = ".users";
@ -45,6 +58,7 @@ $(function() {
users, {users: event.data}
);
break;
case "message":
target = ".messages";
render = Mustache.render(
@ -52,6 +66,7 @@ $(function() {
);
break;
}
if (target != "") {
target = $("[data-id='" + event.target + "'] " + target);
var keepAtBottom = target.isScrollBottom();
@ -92,11 +107,11 @@ $(function() {
(function() {
var highest = 1;
$.fn.bringToTop = function() {
this.css('z-index', highest++);
return this.css('z-index', highest++);
};
$.fn.scrollToBottom = function() {
this.scrollTop(this.prop("scrollHeight"));
return this.scrollTop(this.prop("scrollHeight"));
};
$.fn.isScrollBottom = function() {

5
lib/server.js
View file

@ -51,7 +51,6 @@ function handleUserInput(input) {
var args = text.substr(1).split(" ");
switch (args[0]) {
case "connect":
if (typeof args[1] !== "undefined") {
addNetwork(args[1], true);
@ -59,7 +58,6 @@ function handleUserInput(input) {
break;
case "join":
console.log(args);
if (typeof args[1] === "undefined") {
return;
}
@ -72,13 +70,11 @@ function handleUserInput(input) {
break;
default:
console.log("DEFAULT");
addMessage(
target,
"Command '/" + args[0] + "' does not exist."
);
break;
}
}
@ -91,7 +87,6 @@ function addNetwork(addr, bool) {
);
if (bool) {
console.log("IRC");
network.irc = new irc.Client(addr, "default_user", {
channels: ["#default_channel"]
});