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

Smarter nick completion

This commit is contained in:
Mattias Erming 2014-10-08 23:21:41 +02:00
parent 2e964ca629
commit a76df88c88
1 changed files with 60 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
client/js/shout.js
View File

@ -177,18 +177,35 @@ $(function() {
}); });
socket.on("msg", function(data) { socket.on("msg", function(data) {
var target = data.chan; var target = "#chan-" + data.chan;
if (data.msg.type == "error") { if (data.msg.type == "error") {
target = chat.find(".active").data("id"); target = "#chan-" + chat.find(".active").data("id");
} }
target = "#chan-" + target;
chat.find(target) var chan = chat.find(target);
.find(".messages") var from = data.msg.from;
chan.find(".messages")
.append(render("msg", {messages: [data.msg]})) .append(render("msg", {messages: [data.msg]}))
.trigger("msg", [ .trigger("msg", [
target, target,
data.msg data.msg
]); ]);
if (!chan.hasClass("channel")) {
return;
}
var type = data.msg.type;
if (type == "message" || type == "action") {
var nicks = chan.find(".users").data("nicks");
if (nicks) {
var find = nicks.indexOf(from);
if (find !== -1 && typeof move === "function") {
move(nicks, find, 0);
}
}
}
}); });
socket.on("more", function(data) { socket.on("more", function(data) {
@ -293,9 +310,12 @@ $(function() {
}); });
socket.on("users", function(data) { socket.on("users", function(data) {
var users = chat.find("#chan-" + data.chan) var users = chat.find("#chan-" + data.chan).find(".users").html(render("user", data));
.find(".users") var nicks = [];
.html(render("user", data)); for (var i in data.users) {
nicks.push(data.users[i].name);
}
users.data("nicks", nicks);
}); });
$.cookie.json = true; $.cookie.json = true;
@ -668,7 +688,6 @@ $(function() {
], function(e, keys) { ], function(e, keys) {
var channels = sidebar.find(".chan"); var channels = sidebar.find(".chan");
var index = channels.index(channels.filter(".active")); var index = channels.index(channels.filter(".active"));
var direction = keys.split("+").pop(); var direction = keys.split("+").pop();
switch (direction) { switch (direction) {
case "up": case "up":
@ -702,16 +721,30 @@ $(function() {
function complete(word) { function complete(word) {
var words = commands.slice(); var words = commands.slice();
var users = chat.find(".active") var users = chat.find(".active").find(".users");
.find(".names .user") var nicks = users.data("nicks");
.each(function() {
words.push($(this).text().replace(/[+%@~]/, "")); if (!nicks) {
nicks = [];
users.find(".user").each(function() {
var nick = $(this).text().replace(/[~&@%+]/, "");
nicks.push(nick);
}); });
var channels = sidebar.find(".channel") users.data("nicks", nicks);
}
for (var i in nicks) {
words.push(nicks[i]);
}
var channels = sidebar.find(".chan")
.each(function() { .each(function() {
var chan = $(this).clone().remove("span").text().trim(); var self = $(this);
words.push(chan); if (!self.hasClass("lobby")) {
words.push(self.data("title"));
}
}); });
return $.grep( return $.grep(
words, words,
function(w) { function(w) {
@ -727,8 +760,6 @@ $(function() {
} }
function refresh() { function refresh() {
console.log("REF");
return;
window.onbeforeunload = null; window.onbeforeunload = null;
location.reload(); location.reload();
} }
@ -797,6 +828,17 @@ $(function() {
} }
} }
function move(array, old_index, new_index) {
if (new_index >= array.length) {
var k = new_index - array.length;
while ((k--) + 1) {
this.push(undefined);
}
}
array.splice(new_index, 0, array.splice(old_index, 1)[0]);
return array;
};
document.addEventListener( document.addEventListener(
"visibilitychange", "visibilitychange",
function() { function() {