Merge branch 'master' into dev

package.json

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

server.js

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

www/assets/js/callbacks.js

@@ -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);

www/assets/js/data.js

@@ -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;

www/assets/js/ui.js

@@ -356,7 +356,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");

www/channel.html

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