Merge branch 'v2.0' of github.com:calzoneman/sync into v2.0

This commit is contained in:
calzoneman 2013-06-21 20:42:01 -04:00
commit e400dac160
2 changed files with 7 additions and 4 deletions

View File

@ -908,9 +908,12 @@ Callbacks = {
$("<i/>").addClass("icon-trash").appendTo(del); $("<i/>").addClass("icon-trash").appendTo(del);
(function(li) { (function(li) {
del.click(function() { del.click(function() {
socket.emit("deletePlaylist", { var go = confirm("Are you sure you want to delete playlist '" + li.data("pl-name") + "'?");
name: li.data("pl-name") if(go) {
}); socket.emit("deletePlaylist", {
name: li.data("pl-name")
});
}
}); });
})(li); })(li);
if(hasPermission("playlistaddlist")) { if(hasPermission("playlistaddlist")) {

View File

@ -34,7 +34,7 @@ var CHANNEL = {
var PLAYER = false; var PLAYER = false;
var FLUIDLAYOUT = false; var FLUIDLAYOUT = false;
if($("ytapiplayer").length > 0) { if($("#ytapiplayer").length > 0) {
var VWIDTH = $("#ytapiplayer").parent().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);
} }