From be6f91f17e28a096dd3593728e596022b64d6f0d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kasper=20Rynning-T=C3=B8nnesen?= Date: Thu, 26 Apr 2018 13:49:40 +0200 Subject: [PATCH] Spacebar to pause video again --- server/public/assets/js/listeners.js | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/server/public/assets/js/listeners.js b/server/public/assets/js/listeners.js index 0a246f9f..fff73e35 100755 --- a/server/public/assets/js/listeners.js +++ b/server/public/assets/js/listeners.js @@ -568,17 +568,17 @@ document.addEventListener("keydown", function(e) { find_word = ""; } } else if(event.keyCode == 32 && document.querySelector(".search-container").classList.contains("hide") && window.location.pathname != "/" && - document.querySelector("#text-chat-input") === document.activeElement && - document.querySelector("#password") === document.activeElement && - document.querySelector("#user-pass-input") === document.activeElement && - document.querySelector("#chan_thumbnail") === document.activeElement && - document.querySelector("#chan_description") === document.activeElement && - document.querySelector("#contact-form-from") === document.activeElement && - document.querySelector("#contact-form-message") === document.activeElement && - document.querySelector("#remote_channel") === document.activeElement && - document.querySelector("#import") === document.activeElement && - document.querySelector("#find_input") === document.activeElement && - document.querySelector("#import_spotify") === document.activeElement) { + document.querySelector("#text-chat-input") != document.activeElement && + document.querySelector("#password") != document.activeElement && + document.querySelector("#user-pass-input") != document.activeElement && + document.querySelector("#chan_thumbnail") != document.activeElement && + document.querySelector("#chan_description") != document.activeElement && + document.querySelector("#contact-form-from") != document.activeElement && + document.querySelector("#contact-form-message") != document.activeElement && + document.querySelector("#remote_channel") != document.activeElement && + document.querySelector("#import") != document.activeElement && + document.querySelector("#find_input") != document.activeElement && + document.querySelector("#import_spotify") != document.activeElement) { if(Player.player.getPlayerState() == 1) { event.preventDefault(); Player.player.pauseVideo(); @@ -1049,8 +1049,6 @@ addListener("submit", "#remoteform", function(e) { Mobile_remote.get_input(document.getElementById("remote_channel").value); }); - - addListener("click", ".chat-tab-li", function() { scrollChat(); });