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

Search and keypress issues

Browse Source 
- Not searching on empty strings on soundcloud
- Fixed escape-button issue hiding song-title
- Escape button now works with closing find-dialog
- Fireplace-player fixes on open/close button for search
This commit is contained in:
Kasper Rynning-Tønnesen
2018-05-08 14:56:27 +02:00
parent a0ae20b2fe
commit ee19212c81
2 changed files with 18 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -668,12 +668,8 @@ document.addEventListener("keyup", function(event) {
} }
if(event.keyCode == 27 && window.location.path != "/"){ if(event.keyCode == 27 && window.location.path != "/"){
//$("#results").html(""); //$("#results").html("");
if(document.querySelectorAll("#search-wrapper").length != 0 && !document.querySelector("#search-wrapper").classList.contains("hide")) { Helper.addClass("#search-wrapper", "hide");
Helper.toggleClass("#search-wrapper", "hide"); Helper.removeClass(".song-title", "hide");
}
if(document.querySelectorAll("#song-title").length != 0 && !document.querySelector("#song-title").classList.contains("hide")){
Helper.toggleClass("#song-title", "hide");
}
if(document.querySelector("#search-btn i").innerText == "close") if(document.querySelector("#search-btn i").innerText == "close")
{ {
/*$("#results").slideUp({ /*$("#results").slideUp({
@@ -687,6 +683,17 @@ document.addEventListener("keyup", function(event) {
document.querySelector("#search-btn i").innerText = "search"; document.querySelector("#search-btn i").innerText = "search";
document.querySelector(".search_input").value = ""; document.querySelector(".search_input").value = "";
} }
if(find_started) {
Helper.toggleClass("#find_div", "hide");
document.getElementById("find_input").value = "";
document.getElementById("find_input").blur();
Helper.removeClass(".highlight", "highlight");
found_array = [];
found_array_index = 0;
find_word = "";
find_start = false;
find_started = false;
}
if(document.querySelectorAll(".search-container").length != 0 && !document.querySelector(".search-container").classList.contains("hide")){ if(document.querySelectorAll(".search-container").length != 0 && !document.querySelector(".search-container").classList.contains("hide")){
Helper.toggleClass("#results", "hide"); Helper.toggleClass("#results", "hide");
} }
@@ -694,19 +701,10 @@ document.addEventListener("keyup", function(event) {
clearTimeout(timeout_search); clearTimeout(timeout_search);
Helper.setHtml("#results", ""); Helper.setHtml("#results", "");
document.querySelector("#search").value = ""; document.querySelector("#search").value = "";
if(document.querySelectorAll("#search-wrapper").length != 0 && !document.querySelector("#search-wrapper").classList.contains("hide")) { Helper.addClass("#search-wrapper", "hide");
Helper.toggleClass("#search-wrapper", "hide"); Helper.removeClass("#song-title", "hide");
} document.querySelector("#search-btn i").innerText = "search";
if(document.querySelectorAll("#song-title").length != 0 && !document.querySelector("#song-title").classList.contains("hide")) { Helper.css(".search_results", "display", "none");
Helper.toggleClass("#song-title", "hide");
}
if(document.querySelector("#search-btn i").innerText == "close")
{
document.querySelector("#search-btn i").innerText == "search";
}
if(document.querySelectorAll(".search-container").length != 0 && !document.querySelector(".search-container").classList.contains("hide")){
Helper.toggleClass("#results", "hide");
}
if(fireplace_initiated) { if(fireplace_initiated) {
fireplace_initiated = false; fireplace_initiated = false;
Player.fireplace.destroy(); Player.fireplace.destroy();

2
server/public/assets/js/search.js
View File

@@ -191,10 +191,10 @@ var Search = {
}, },
soundcloudSearch: function(keyword) { soundcloudSearch: function(keyword) {
if(keyword.length == 0) return;
SC.get('/tracks', { SC.get('/tracks', {
q: keyword q: keyword
}).then(function(tracks) { }).then(function(tracks) {
console.log(tracks);
var pre_result = document.createElement("div"); var pre_result = document.createElement("div");
pre_result.innerHTML = result_html.outerHTML; pre_result.innerHTML = result_html.outerHTML;