moon
/
sync
mirror of https://github.com/calzoneman/sync.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Minor fixes for v2.2 

- 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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@ -2,7 +2,7 @@
"author": "Calvin Montgomery", "author": "Calvin Montgomery",
"name": "CyTube", "name": "CyTube",
"description": "Online media synchronizer and chat", "description": "Online media synchronizer and chat",
"version": "2.2.3", "version": "2.2.4",
"repository": { "repository": {
"url": "http://github.com/calzoneman/sync" "url": "http://github.com/calzoneman/sync"
}, },

2
server.js
View File

@ -6,7 +6,7 @@ var Logger = require("./logger");
var Channel = require("./channel"); var Channel = require("./channel");
var User = require("./user"); var User = require("./user");
const VERSION = "2.2.3"; const VERSION = "2.2.4";
function getIP(req) { function getIP(req) {
var raw = req.connection.remoteAddress; var raw = req.connection.remoteAddress;

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

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

4
www/assets/js/data.js
View File

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

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

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

4
www/channel.html
View File

@ -207,6 +207,10 @@
</div> </div>
</div> </div>
</div> </div>
<div class="row" id="resizewrap">
<div class="span5"></div>
<div class="span7" id="videowidth"></div>
</div>
</div> </div>
<div class="push"></div> <div class="push"></div>
<div id="sitefooter"> <div id="sitefooter">