mirror of
https://github.com/KevinMidboe/zoff.git
synced 2025-10-29 18:00:23 +00:00
Fixed issue with volumeslider being messed up on windowresize
This commit is contained in:
Kasper Rynning-Tønnesen
@@ -11,6 +11,7 @@ var time_regex = /P((([0-9]*\.?[0-9]*)Y)?(([0-9]*\.?[0-9]*)M)?(([0-9]*
|
||||
var conf = [];
|
||||
var private_channel = false;
|
||||
var music = 0;
|
||||
var slider_type = "horizontal";
|
||||
var gotten_np = false;
|
||||
var frontpage = 1;
|
||||
var empty_clear = false;
|
||||
@@ -335,56 +336,46 @@ function init(){
|
||||
tooltip: "Search"
|
||||
});
|
||||
|
||||
/*$("#prev").tooltip({
|
||||
delay: 5,
|
||||
position: "bottom",
|
||||
tooltip: "Previous",
|
||||
});
|
||||
|
||||
$("#skip").tooltip({
|
||||
delay: 5,
|
||||
position: "bottom",
|
||||
tooltip: "Skip",
|
||||
});*/
|
||||
|
||||
$("#shuffle").tooltip({
|
||||
$("#shuffle").tooltip({
|
||||
delay: 5,
|
||||
position: "bottom",
|
||||
tooltip: "Shuffle",
|
||||
});
|
||||
});
|
||||
|
||||
$("#settings").tooltip({
|
||||
$("#settings").tooltip({
|
||||
delay: 5,
|
||||
position: "bottom",
|
||||
tooltip: "Settings",
|
||||
});
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
window.onYouTubeIframeAPIReady = Player.onYouTubeIframeAPIReady;
|
||||
if(Player.player === "" || Player.player === undefined || Helper.mobilecheck()) Player.loadPlayer();
|
||||
//}
|
||||
window.onYouTubeIframeAPIReady = Player.onYouTubeIframeAPIReady;
|
||||
if(Player.player === "" || Player.player === undefined || Helper.mobilecheck()) Player.loadPlayer();
|
||||
//}
|
||||
|
||||
if(Helper.mobilecheck()) {
|
||||
if(Helper.mobilecheck()) {
|
||||
Mobile_remote.initiate_volume();
|
||||
} else {
|
||||
} else {
|
||||
$('input#chan_description').characterCounter();
|
||||
}
|
||||
window_width_volume_slider();
|
||||
}
|
||||
|
||||
setup_admin_listener();
|
||||
setup_list_listener();
|
||||
setup_chat_listener();
|
||||
setup_admin_listener();
|
||||
setup_list_listener();
|
||||
setup_chat_listener();
|
||||
|
||||
socket.emit("get_history", {channel: chan.toLowerCase(), all: false});
|
||||
socket.emit("get_history", {channel: chan.toLowerCase(), all: true});
|
||||
socket.emit("get_history", {channel: chan.toLowerCase(), all: false});
|
||||
socket.emit("get_history", {channel: chan.toLowerCase(), all: true});
|
||||
|
||||
if(!Helper.mobilecheck() && $("#alreadychannel").length === 0) setup_host_initialization();
|
||||
if(!Helper.mobilecheck() && $("#alreadychannel").length === 0) setup_host_initialization();
|
||||
|
||||
if(!Helper.msieversion() && !Helper.mobilecheck()) Notification.requestPermission();
|
||||
if(!Helper.msieversion() && !Helper.mobilecheck()) Notification.requestPermission();
|
||||
|
||||
$(".search_input").focus();
|
||||
$(".search_input").focus();
|
||||
|
||||
Helper.sample();
|
||||
if(!Helper.mobilecheck()) {
|
||||
Helper.sample();
|
||||
if(!Helper.mobilecheck()) {
|
||||
$('.castButton').tooltip({
|
||||
delay: 5,
|
||||
position: "top",
|
||||
@@ -407,35 +398,35 @@ if(!Helper.mobilecheck()) {
|
||||
$(".sp-cancel").addClass("btn-flat waves-effect waves-red");
|
||||
$(".sp-cancel").removeClass("sp-cancel");
|
||||
$(".sp-button-container").append("<a href='#' class='btn-flat waves-effect waves-green sp-choose-link'>CHOOSE</a>");
|
||||
}
|
||||
}
|
||||
|
||||
$(".sp-choose-link").on("click", function(e) {
|
||||
$(".sp-choose-link").on("click", function(e) {
|
||||
e.preventDefault();
|
||||
$(".sp-choose").trigger("click");
|
||||
});
|
||||
});
|
||||
|
||||
$("#results" ).hover( function() { $("div.result").removeClass("hoverResults"); i = 0; }, function(){ });
|
||||
$("#search").focus();
|
||||
$("#embed-button").css("display", "inline-block");
|
||||
$("#embed-area").val(embed_code(embed_autoplay, embed_width, embed_height, color));
|
||||
$("#search").attr("placeholder", "Find song on YouTube...");
|
||||
$("#results" ).hover( function() { $("div.result").removeClass("hoverResults"); i = 0; }, function(){ });
|
||||
$("#search").focus();
|
||||
$("#embed-button").css("display", "inline-block");
|
||||
$("#embed-area").val(embed_code(embed_autoplay, embed_width, embed_height, color));
|
||||
$("#search").attr("placeholder", "Find song on YouTube...");
|
||||
|
||||
if(!$("footer").hasClass("padding-bottom-novideo")) {
|
||||
if(!$("footer").hasClass("padding-bottom-novideo")) {
|
||||
$("footer").addClass("padding-bottom-novideo");
|
||||
}
|
||||
}
|
||||
|
||||
if(!/chrom(e|ium)/.test(navigator.userAgent.toLowerCase()) && !Helper.mobilecheck()){
|
||||
if(!/chrom(e|ium)/.test(navigator.userAgent.toLowerCase()) && !Helper.mobilecheck()){
|
||||
$(".castButton").css("display", "none");
|
||||
}
|
||||
}
|
||||
|
||||
Helper.log("chromecastAvailable" + chromecastAvailable);
|
||||
Helper.log("chromecastAvailable" + chromecastReady);
|
||||
Helper.log("chromecastAvailable" + chromecastAvailable);
|
||||
Helper.log("chromecastAvailable" + chromecastReady);
|
||||
|
||||
if(chromecastAvailable){
|
||||
if(chromecastAvailable){
|
||||
hide_native(1);
|
||||
} else if(chromecastReady) {
|
||||
} else if(chromecastReady) {
|
||||
initializeCastApi();
|
||||
} else {
|
||||
} else {
|
||||
window['__onGCastApiAvailable'] = function(loaded, errorInfo) {
|
||||
if (loaded) {
|
||||
setTimeout(function(){
|
||||
@@ -446,9 +437,9 @@ if(chromecastAvailable){
|
||||
chromecastReady = true;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
$.contextMenu({
|
||||
$.contextMenu({
|
||||
selector: '.playlist-element',
|
||||
reposition: true,
|
||||
autoHide: true,
|
||||
@@ -507,11 +498,11 @@ $.contextMenu({
|
||||
}
|
||||
}
|
||||
}
|
||||
});
|
||||
});
|
||||
|
||||
if(!Helper.mobilecheck() && navigator.userAgent.match(/iPad/i) == null){
|
||||
if(!Helper.mobilecheck() && navigator.userAgent.match(/iPad/i) == null){
|
||||
setTimeout(function(){set_title_width();}, 100);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
initializeCastApi = function() {
|
||||
@@ -1042,9 +1033,9 @@ $(document).on("click", ".accept-delete", function(e) {
|
||||
/*var delete_id = $(this).attr("data-video-id");
|
||||
if(delete_id) {
|
||||
List.vote(delete_id, 'del');
|
||||
}*/
|
||||
socket.emit("delete_all", {channel: chan.toLowerCase(), adminpass: adminpass == "" ? "" : Crypt.crypt_pass(adminpass), pass: embed ? '' : Crypt.crypt_pass(Crypt.get_userpass(chan.toLowerCase()))});
|
||||
$("#delete_song_alert").modal("close");
|
||||
}*/
|
||||
socket.emit("delete_all", {channel: chan.toLowerCase(), adminpass: adminpass == "" ? "" : Crypt.crypt_pass(adminpass), pass: embed ? '' : Crypt.crypt_pass(Crypt.get_userpass(chan.toLowerCase()))});
|
||||
$("#delete_song_alert").modal("close");
|
||||
});
|
||||
|
||||
$(document).keyup(function(event) {
|
||||
@@ -1689,8 +1680,20 @@ $(window).resize(function(){
|
||||
set_title_width();
|
||||
if($("#controls").length > 0 && !Helper.mobilecheck()) $("#seekToDuration").css("top", $("#controls").position().top - 55);
|
||||
else if($("#controls").length > 0) $("#seekToDuration").css("top", $("#controls").position().top - 20);
|
||||
|
||||
window_width_volume_slider();
|
||||
}
|
||||
})
|
||||
});
|
||||
|
||||
function window_width_volume_slider() {
|
||||
if(window.innerWidth <= 600 && slider_type == "horizontal") {
|
||||
Playercontrols.initSlider(true);
|
||||
slider_type = "vertical";
|
||||
} else if(window.innerWidth > 600 && slider_type == "vertical") {
|
||||
Playercontrols.initSlider();
|
||||
slider_type = "horizontal";
|
||||
}
|
||||
}
|
||||
|
||||
$(document).on( "click", ".result-object", function(e){
|
||||
var $html = $(e.target);
|
||||
|
||||
@@ -17,9 +17,10 @@ var Playercontrols = {
|
||||
$("#fullscreen").on("click", Playercontrols.fullscreen);
|
||||
},
|
||||
|
||||
initSlider: function() {
|
||||
initSlider: function(vertical) {
|
||||
try {
|
||||
vol = (Crypt.get_volume());
|
||||
$("#volume").slider( "destroy" );
|
||||
} catch(e){}
|
||||
var slider_values = {
|
||||
min: 0,
|
||||
@@ -28,12 +29,11 @@ var Playercontrols = {
|
||||
range: "min",
|
||||
animate: true,
|
||||
slide: function(event, ui) {
|
||||
|
||||
Playercontrols.setVolume(ui.value);
|
||||
try{Crypt.set_volume(ui.value);}catch(e){}
|
||||
}
|
||||
};
|
||||
if(Helper.mobilecheck()) {
|
||||
if(Helper.mobilecheck() || vertical) {
|
||||
slider_values.orientation = "vertical";
|
||||
$(".volume-container").toggleClass("hide");
|
||||
}
|
||||
@@ -109,7 +109,7 @@ var Playercontrols = {
|
||||
},
|
||||
|
||||
mute_video: function() {
|
||||
if(Helper.mobilecheck()) {
|
||||
if(Helper.mobilecheck() || slider_type == "vertical") {
|
||||
$(".volume-container").toggleClass("hide");
|
||||
} else {
|
||||
if(!Player.player.isMuted()) {
|
||||
|
||||
Reference in New Issue
Block a user