rainbownapkin/fore.st
1
0
Fork 0
Code Issues 13 Pull requests Projects Releases Packages Wiki Activity Actions

Fix more things

Browse source
This commit is contained in:
calzoneman 2014-01-07 22:47:00 -06:00
parent 1aa464caa5
commit 22c4e8f9ff
5 changed files with 122 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

17
www/assets/js/callbacks.js
View file

@ -713,7 +713,7 @@ Callbacks = {
div.data("rank", data.rank);
div.data("leader", Boolean(data.leader));
div.data("profile", data.profile);
div.data("icon", data.meta.icon);
div.data("meta", data.meta);
div.data("afk", data.meta.afk);
formatUserlistItem(div, data);
addUserDropdown(div, data);
@ -721,6 +721,15 @@ Callbacks = {
sortUserlist();
},
setUserMeta: function (data) {
var user = findUserlistItem(data.name);
if (user == null) {
return;
}
user.data("meta", data);
},
setUserProfile: function (data) {
var user = findUserlistItem(data.name);
if (user === null)
@ -978,8 +987,8 @@ Callbacks = {
handleMediaUpdate(data);
},
setPlaylistLocked: function(data) {
CHANNEL.openqueue = !data.locked;
setPlaylistLocked: function (locked) {
CHANNEL.openqueue = !locked;
handlePermissionChange();
if(CHANNEL.openqueue) {
$("#qlockbtn").removeClass("btn-danger")
@ -1191,7 +1200,7 @@ Callbacks = {
}
}
var SOCKET_DEBUG = false;
var SOCKET_DEBUG = true;
setupCallbacks = function() {
for(var key in Callbacks) {
(function(key) {

11
www/assets/js/util.js
View file

@ -110,6 +110,15 @@ function formatUserlistItem(div) {
.appendTo(profile);
}
$("<strong/>").text(data.name).appendTo(profile);
var meta = div.data("meta") || {};
if (meta.ip) {
$("<br/>").appendTo(profile);
$("<em/>").text(meta.ip).appendTo(profile);
}
if (meta.aliases) {
$("<p/>").text("aliases: " + meta.aliases.join(", ")).appendTo(profile);
}
$("<p/>").text(data.profile.text).appendTo(profile);
});
name.mousemove(function(ev) {
@ -555,7 +564,7 @@ function showUserOptions() {
$("#us-chat-notice").prop("checked", USEROPTS.blink_title);
$("#us-boop").prop("checked", USEROPTS.boop);
$("#us-sendbtn").prop("checked", USEROPTS.chatbtn);
$("#us-modflair").prop("checked", USEROPTS.modhat);
$("#us-joinmessage").prop("checked", USEROPTS.joinmessage);