From 605468e891f7cb3bd3c5973f90cad9425a8674d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kasper=20Rynning-T=C3=B8nnesen?= Date: Tue, 7 Nov 2017 16:44:24 +0100 Subject: [PATCH] No scroll on search --- server/public/assets/js/listeners.js | 1 + server/public/assets/js/search.js | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/server/public/assets/js/listeners.js b/server/public/assets/js/listeners.js index 7a13ba90..5fd982c5 100755 --- a/server/public/assets/js/listeners.js +++ b/server/public/assets/js/listeners.js @@ -1053,6 +1053,7 @@ $(document).keyup(function(event) { $("#results").empty(); } }); + $("body").attr("style", "overflow-y:auto") $("#search-btn i").html("search"); $(".search_input").val(""); } diff --git a/server/public/assets/js/search.js b/server/public/assets/js/search.js index f4452483..cadcfd1b 100755 --- a/server/public/assets/js/search.js +++ b/server/public/assets/js/search.js @@ -12,6 +12,7 @@ var Search = { $("#song-title").toggleClass("hide"); //$("#results").empty(); if($("#search-btn i").html() == "close") { + $("body").attr("style", "overflow-y:auto") $("#results").slideUp({ complete: function() { $("#results").empty(); @@ -121,6 +122,7 @@ var Search = { } $(".search_results").empty(); if(output.length > 0) { + //$(window).scrollTop(0); if(!pagination && fresh) { $(".search_results").css("display", "none"); } @@ -129,7 +131,7 @@ var Search = { if(!pagination && fresh) { $(".search_results").slideDown(); } - + $("body").attr("style", "overflow-y:hidden !important") if(nextPageToken) { $(".next-results-button").attr("data-pagination", nextPageToken); @@ -289,6 +291,7 @@ var Search = { $("#results").html(''); Search.showSearch(); document.getElementById("search").value = ""; + $("body").attr("style", "overflow-y:auto") $("#results").html = ""; $(".main").removeClass("blurT"); $("#controls").removeClass("blurT");