Fixed issue with event trying to fire without existing

This commit is contained in:
Kasper Rynning-Tønnesen
2017-05-05 16:45:37 +02:00
parent 611bee8a99
commit b9aa04f360
3 changed files with 16 additions and 15 deletions
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
+14 -13
View File
@@ -108,6 +108,7 @@ try{
navigator.serviceWorker.getRegistration('/').then(function(registration) { navigator.serviceWorker.getRegistration('/').then(function(registration) {
registration.unregister(); registration.unregister();
});*/ });*/
} catch(e) {} } catch(e) {}
$().ready(function(){ $().ready(function(){
@@ -807,7 +808,7 @@ function seekToClick(e){
} }
} }
$(document).keyup(function(e) { $(document).keyup(function(event) {
if(event.keyCode == 27){ if(event.keyCode == 27){
$("#results").html(""); $("#results").html("");
if($("#search-wrapper").length != 0 && !Helper.contains($("#search-wrapper").attr("class").split(" "), "hide")) if($("#search-wrapper").length != 0 && !Helper.contains($("#search-wrapper").attr("class").split(" "), "hide"))
@@ -837,18 +838,18 @@ $(document).keyup(function(e) {
//$("#search-btn i").html("mdi-navigation-close"); //$("#search-btn i").html("mdi-navigation-close");
$("#search-btn i").html("search"); $("#search-btn i").html("search");
} }
if($(".search-container").length != 0 && !Helper.contains($(".search-container").attr("class").split(" "), "hide")){ if($(".search-container").length != 0 && !Helper.contains($(".search-container").attr("class").split(" "), "hide")){
$("#results").toggleClass("hide"); $("#results").toggleClass("hide");
} }
if(fireplace_initiated) { if(fireplace_initiated) {
fireplace_initiated = false; fireplace_initiated = false;
Player.fireplace.destroy(); Player.fireplace.destroy();
$("#fireplace_player").css("display", "none"); $("#fireplace_player").css("display", "none");
} else { } else {
fireplace_initiated = true; fireplace_initiated = true;
$("#fireplace_player").css("display", "block"); $("#fireplace_player").css("display", "block");
Player.createFireplacePlayer(); Player.createFireplacePlayer();
} }
} }
}); });