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

Minor fixes for v2.2

Browse source 
- If NO_WEBSOCKETS or USEROPTS.altsocket are true, don't use websockets
- Base resizing on an invisible div (some channels remove/hide #queue)
- Names are properly italicized when AFK
This commit is contained in:
calzoneman 2013-08-04 11:44:48 -04:00
parent 20f0d1c316
commit 15085fc6ae
6 changed files with 11 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -672,7 +672,7 @@ Callbacks = {
if(data.afk) {
$("<i/>").addClass("icon-time")
.appendTo(users[i].children[0]);
$(users[i].children[1]).css("font-style", "");
$(users[i].children[1]).css("font-style", "italic");
}
}
}
@ -1111,7 +1111,7 @@ setupCallbacks = function() {
$.getScript(IO_URL+"/socket.io/socket.io.js", function() {
try {
if(NO_WEBSOCKETS) {
if(NO_WEBSOCKETS || USEROPTS.altsocket) {
var i = io.transports.indexOf("websocket");
if(i >= 0)
io.transports.splice(i, 1);

6
www/assets/js/data.js
View file

@ -37,10 +37,8 @@ var CHANNEL = {
var PLAYER = false;
var VIDEOQUALITY = false;
var FLUIDLAYOUT = false;
if($("#ytapiplayer").length > 0) {
var VWIDTH = $("#ytapiplayer").parent().css("width").replace("px", "");
var VHEIGHT = ""+parseInt(parseInt(VWIDTH) * 9 / 16);
}
var VWIDTH = $("#videowidth").css("width").replace("px", "");
var VHEIGHT = ""+parseInt(parseInt(VWIDTH) * 9 / 16);
var MEDIA = { hash: "" };
var PL_MOVING = false;
var PL_ADDING = false;

2
www/assets/js/ui.js
View file

@ -340,7 +340,7 @@ $("#shuffleplaylist").click(function() {
/* layout stuff */
$(window).resize(function() {
VWIDTH = $("#queue").css("width").replace("px", "");
VWIDTH = $("#videowidth").css("width").replace("px", "");
VHEIGHT = ""+parseInt(parseInt(VWIDTH) * 9 / 16);
$("#messagebuffer").css("height", (VHEIGHT - 31) + "px");
$("#userlist").css("height", (VHEIGHT - 31) + "px");