Fix layout issues

This commit is contained in:
calzoneman 2014-02-25 23:28:32 -06:00
parent 5565dd49fd
commit ced68d9304
2 changed files with 7 additions and 5 deletions

View File

@ -1111,8 +1111,9 @@ setupCallbacks = function() {
for(var key in Callbacks) { for(var key in Callbacks) {
(function(key) { (function(key) {
socket.on(key, function(data) { socket.on(key, function(data) {
if (SOCKET_DEBUG) if (SOCKET_DEBUG) {
console.log(key, data); console.log(key, data);
}
Callbacks[key](data); Callbacks[key](data);
}); });
})(key); })(key);
@ -1135,11 +1136,11 @@ try {
io.transports.splice(i, 1); io.transports.splice(i, 1);
} }
} }
var opts = {}; if (ALLOW_SSL && (location.protocol === "https:" || USEROPTS.secure_connection)) {
if (location.protocol === "https:" || USEROPTS.secure_connection) { socket = io.connect(IO_URL, opts);
opts.secure = true; } else {
socket = io.connect(IO_URL);
} }
socket = io.connect(IO_URL, opts);
setupCallbacks(); setupCallbacks();
} catch (e) { } catch (e) {
if (e) { if (e) {

View File

@ -888,6 +888,7 @@ function handlePermissionChange() {
setVisible("#chatline", CLIENT.rank >= 0); setVisible("#chatline", CLIENT.rank >= 0);
setVisible("#queue", hasPermission("seeplaylist")); setVisible("#queue", hasPermission("seeplaylist"));
setVisible("#plmeta", hasPermission("seeplaylist")); setVisible("#plmeta", hasPermission("seeplaylist"));
resizeStuff();
$("#getplaylist").attr("disabled", !hasPermission("seeplaylist")); $("#getplaylist").attr("disabled", !hasPermission("seeplaylist"));
setVisible("#showmediaurl", hasPermission("playlistadd")); setVisible("#showmediaurl", hasPermission("playlistadd"));