KevinMidboe/zoff
1
0
Fork 0
mirror of https://github.com/KevinMidboe/zoff.git synced 2025-10-29 18:00:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed small issue with volume-slider being faulty initiated sometimes

Browse Source
This commit is contained in:
Kasper Rynning-Tønnesen
2017-11-07 15:09:23 +01:00
parent c86372b0fc
commit 847c42220e
3 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
server/public/assets/js/listeners.js
View File

@@ -301,7 +301,7 @@ function init(){
$(".playlist").css("opacity", "1"); $(".playlist").css("opacity", "1");
Player.readyLooks(); Player.readyLooks();
Playercontrols.initYoutubeControls(Player.player); Playercontrols.initYoutubeControls(Player.player);
Playercontrols.initSlider(); //Playercontrols.initSlider();
Player.player.setVolume(Crypt.get_volume()); Player.player.setVolume(Crypt.get_volume());
$(".video-container").removeClass("no-opacity"); $(".video-container").removeClass("no-opacity");
@@ -1687,11 +1687,11 @@ $(window).resize(function(){
function window_width_volume_slider() { function window_width_volume_slider() {
if(window.innerWidth <= 600 && slider_type == "horizontal") { if(window.innerWidth <= 600 && slider_type == "horizontal") {
Playercontrols.initSlider(true);
slider_type = "vertical"; slider_type = "vertical";
} else if(window.innerWidth > 600 && slider_type == "vertical") {
Playercontrols.initSlider(); Playercontrols.initSlider();
} else if(window.innerWidth > 600 && slider_type == "vertical") {
slider_type = "horizontal"; slider_type = "horizontal";
Playercontrols.initSlider();
} }
} }

3
server/public/assets/js/player.js
View File

@@ -432,7 +432,8 @@ var Player = {
Playercontrols.initYoutubeControls(Player.player); Playercontrols.initYoutubeControls(Player.player);
Playercontrols.initSlider(); Playercontrols.initSlider();
Player.player.setVolume(Crypt.get_volume()); Player.player.setVolume(Crypt.get_volume());
}catch(e){} }catch(e){
}
}, },
readyLooks: function() { readyLooks: function() {

12
server/public/assets/js/playercontrols.js
View File

@@ -17,11 +17,13 @@ var Playercontrols = {
$("#fullscreen").on("click", Playercontrols.fullscreen); $("#fullscreen").on("click", Playercontrols.fullscreen);
}, },
initSlider: function(vertical) { initSlider: function() {
try { try {
vol = (Crypt.get_volume()); vol = (Crypt.get_volume());
$("#volume").slider( "destroy" ); $("#volume").slider("destroy");
} catch(e){} } catch(e){
}
var slider_values = { var slider_values = {
min: 0, min: 0,
max: 100, max: 100,
@@ -33,10 +35,12 @@ var Playercontrols = {
try{Crypt.set_volume(ui.value);}catch(e){} try{Crypt.set_volume(ui.value);}catch(e){}
} }
}; };
if(Helper.mobilecheck() || vertical) { if(Helper.mobilecheck() || slider_type == "vertical") {
slider_values.orientation = "vertical"; slider_values.orientation = "vertical";
if(!$(".volume-container").hasClass("hide")) {
$(".volume-container").toggleClass("hide"); $(".volume-container").toggleClass("hide");
} }
}
$("#volume").slider(slider_values); $("#volume").slider(slider_values);
Playercontrols.choose_button(vol, false); Playercontrols.choose_button(vol, false);
}, },