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

Merge branch 'master' into dev

Browse source
This commit is contained in:
calzoneman 2013-07-01 17:44:27 -04:00
commit 0611a6b0a6
6 changed files with 37 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -190,6 +190,8 @@ $("#userpl_save").click(function() {
var caret = btn.find(".caret").detach();
btn.text($(select).text());
caret.appendTo(btn);
if(PLAYER.type == "yt" && PLAYER.player.setPlaybackQuality)
PLAYER.player.setPlaybackQuality(VIDEOQUALITY);
});
}
qualHandler("#quality_240p", "small");
@ -199,6 +201,12 @@ $("#userpl_save").click(function() {
qualHandler("#quality_1080p", "hd1080");
})();
$("#mediarefresh").click(function() {
PLAYER.type = "";
PLAYER.id = "";
socket.emit("playerReady");
});
/* playlist controls */
$("#queue").sortable({