evan/deemixer
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added search continuous scrolling

Browse Source
This commit is contained in:
RemixDev 2020-04-09 16:06:33 +02:00
parent ea7755675c
commit d58fca7266
2 changed files with 75 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
public/index.html
View File

@ -106,7 +106,7 @@
<div v-for="release in results.data" class="release">
<img class="rounded coverart" v-bind:src="'https://e-cdns-images.dzcdn.net/images/cover/' + release.ALB_PICTURE + '/156x156-000000-80-0-0.jpg'">
<p class="title">{{ release.ALB_TITLE }}</p>
<p class="subtitle">{{ release.ART_NAME+' - '+release.NUMBER_TRACK+' tracks' }}</p>
<p class="subtitle">{{ 'by '+release.ART_NAME }}</p>
</div>
</div>
</div>

79
public/js/frontend.js
View File

@ -1,5 +1,7 @@
// Initialization
doAjax("/init", "POST");
search_selected = ""
main_selected=""
// Functions to connect to the Flask server
function getHttpRequestObject(){
@ -64,7 +66,49 @@ function changeTab(evt, section, tabName) {
tablinks[i].className = tablinks[i].className.replace(" active", "");
}
document.getElementById(tabName).style.display = "block";
window[section+"_selected"] = tabName
evt.currentTarget.className += " active";
if (document.getElementById("content").offsetHeight >= document.getElementById("content").scrollHeight && main_selected == "search_tab" && ["track_search", "album_search", "artist_search", "playlist_search"].indexOf(search_selected) != -1){
scrolledSearch(window[search_selected.split("_")[0]+"Search"])
}
}
$('#content').on('scroll', function() {
if($(this).scrollTop() + $(this).innerHeight() >= $(this)[0].scrollHeight) {
if (main_selected == "search_tab" && ["track_search", "album_search", "artist_search", "playlist_search"].indexOf(search_selected) != -1){
scrolledSearch(window[search_selected.split("_")[0]+"Search"])
}
}
})
function scrolledSearch(vueTab){
query = vueTab.query
if (vueTab.results.next < vueTab.results.total){
doAjax("/search", "POST", searchUpadate, {term: vueTab.query, type: vueTab.type, start: vueTab.results.next, nb: vueTab.nb});
}
}
function searchUpadate(result){
console.log(result)
vueTab = null;
switch (result.type) {
case "TRACK":
vueTab = trackSearch;
break;
case "ALBUM":
vueTab = albumSearch;
break;
case "ARTIST":
vueTab = artistSearch;
break;
case "PLAYLIST":
vueTab = playlistSearch;
break;
}
if (vueTab && vueTab.results.next != result.next){
vueTab.results.next = result.next
vueTab.results.data = vueTab.results.data.concat(result.data)
}
}
function clickElement(button){
@ -82,6 +126,7 @@ var mainSearch = new Vue({
"PLAYLIST": "Playlists"
},
results: {
QUERY: "",
ORDER: [],
ALBUM: {},
ARTIST: {},
@ -101,8 +146,13 @@ var mainSearch = new Vue({
var trackSearch = new Vue({
el: '#track_search',
data: {
type: "TRACK",
nb: 40,
query: "",
results: {
data: []
data: [],
next: 0,
total: 0
}
}
})
@ -110,8 +160,13 @@ var trackSearch = new Vue({
var albumSearch = new Vue({
el: '#album_search',
data: {
type: "ALBUM",
nb: 20,
query: "",
results: {
data: []
data: [],
next: 0,
total: 0
}
}
})
@ -119,8 +174,13 @@ var albumSearch = new Vue({
var artistSearch = new Vue({
el: '#artist_search',
data: {
type: "ARTIST",
nb: 20,
query: "",
results: {
data: []
data: [],
next: 0,
total: 0
}
}
})
@ -128,8 +188,13 @@ var artistSearch = new Vue({
var playlistSearch = new Vue({
el: '#playlist_search',
data: {
type: "PLAYLIST",
nb: 20,
query: "",
results: {
data: []
data: [],
next: 0,
total: 0
}
}
})
@ -143,7 +208,7 @@ $("#searchbar").keyup(function(e){
doAjax("/download", "POST", null, {url: term});
else{
document.getElementById("search_tab_content").style.display = "none";
doAjax("/search", "POST", searchHandler, {term: term});
doAjax("/mainsearch", "POST", searchHandler, {term: term});
}
}
})
@ -155,6 +220,10 @@ function searchHandler(result){
albumSearch.results = result.ALBUM
artistSearch.results = result.ARTIST
playlistSearch.results = result.PLAYLIST
trackSearch.query = result.QUERY
albumSearch.query = result.QUERY
artistSearch.query = result.QUERY
playlistSearch.query = result.QUERY
document.getElementById("search_defaultopen").click();
document.getElementById("search_tab_content").style.display = "block";
document.getElementById("show_searchtab").click();