diff --git a/server/public/assets/js/listeners.js b/server/public/assets/js/listeners.js index 53b31a35..50dce0ff 100755 --- a/server/public/assets/js/listeners.js +++ b/server/public/assets/js/listeners.js @@ -301,7 +301,7 @@ function init(){ $(".playlist").css("opacity", "1"); Player.readyLooks(); Playercontrols.initYoutubeControls(Player.player); - Playercontrols.initSlider(); + //Playercontrols.initSlider(); Player.player.setVolume(Crypt.get_volume()); $(".video-container").removeClass("no-opacity"); @@ -1687,11 +1687,11 @@ $(window).resize(function(){ 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(); + } else if(window.innerWidth > 600 && slider_type == "vertical") { slider_type = "horizontal"; + Playercontrols.initSlider(); } } diff --git a/server/public/assets/js/player.js b/server/public/assets/js/player.js index 3e41a4e9..3d8635f0 100755 --- a/server/public/assets/js/player.js +++ b/server/public/assets/js/player.js @@ -432,7 +432,8 @@ var Player = { Playercontrols.initYoutubeControls(Player.player); Playercontrols.initSlider(); Player.player.setVolume(Crypt.get_volume()); - }catch(e){} + }catch(e){ + } }, readyLooks: function() { diff --git a/server/public/assets/js/playercontrols.js b/server/public/assets/js/playercontrols.js index 1f3a9911..697314e7 100755 --- a/server/public/assets/js/playercontrols.js +++ b/server/public/assets/js/playercontrols.js @@ -17,11 +17,13 @@ var Playercontrols = { $("#fullscreen").on("click", Playercontrols.fullscreen); }, - initSlider: function(vertical) { + initSlider: function() { try { vol = (Crypt.get_volume()); - $("#volume").slider( "destroy" ); - } catch(e){} + $("#volume").slider("destroy"); + } catch(e){ + + } var slider_values = { min: 0, max: 100, @@ -33,9 +35,11 @@ var Playercontrols = { try{Crypt.set_volume(ui.value);}catch(e){} } }; - if(Helper.mobilecheck() || vertical) { + if(Helper.mobilecheck() || slider_type == "vertical") { slider_values.orientation = "vertical"; - $(".volume-container").toggleClass("hide"); + if(!$(".volume-container").hasClass("hide")) { + $(".volume-container").toggleClass("hide"); + } } $("#volume").slider(slider_values); Playercontrols.choose_button(vol, false);