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-08-19 00:23:13 -05:00
commit d62931098d
15 changed files with 212 additions and 156 deletions
Download patch file Download diff file Expand all files Collapse all files

2
www/assets/js/callbacks.js
View file

@ -758,7 +758,7 @@ Callbacks = {
}
makeAlert("Error", data, "alert-error")
.addClass("span12")
.insertAfter($("#mediaurl").parent());
.insertBefore($("#extended_controls"));
},
setTemp: function(data) {

3
www/assets/js/data.js
View file

@ -117,7 +117,8 @@ var USEROPTS = {
ignore_channelcss : getOrDefault("ignore_channelcss", false),
ignore_channeljs : getOrDefault("ignore_channeljs", false),
sort_rank : getOrDefault("sort_rank", false),
sort_afk : getOrDefault("sort_afk", false)
sort_afk : getOrDefault("sort_afk", false),
default_quality : getOrDefault("default_quality", "#quality_auto")
};
var NO_WEBSOCKETS = USEROPTS.altsocket;

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

@ -224,10 +224,15 @@ $("#userpl_save").click(function() {
});
/* video controls */
function selectQuality(select, preset) {
}
(function() {
function qualHandler(select, preset) {
$(select).click(function() {
VIDEOQUALITY = preset;
USEROPTS.default_quality = select;
saveOpts();
var btn = $("#qualitywrap .btn.dropdown-toggle");
var caret = btn.find(".caret").detach();
btn.text($(select).text());
@ -236,11 +241,14 @@ $("#userpl_save").click(function() {
PLAYER.player.setPlaybackQuality(VIDEOQUALITY);
});
}
qualHandler("#quality_auto", "");
qualHandler("#quality_240p", "small");
qualHandler("#quality_360p", "medium");
qualHandler("#quality_480p", "large");
qualHandler("#quality_720p", "hd720");
qualHandler("#quality_1080p", "hd1080");
if($(USEROPTS.default_quality).length > 0)
$(USEROPTS.default_quality).click();
})();
$("#mediarefresh").click(function() {