From 8cb8c46f2f4961df6db070bd22b118e7c196577c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kasper=20Rynning-T=C3=B8nnesen?= Date: Wed, 25 Apr 2018 17:11:58 +0200 Subject: [PATCH] Working results --- gulpfile.js | 4 ++-- server/public/assets/css/style.css | 2 +- server/public/assets/js/listeners.js | 7 +++++-- server/public/assets/js/mobileremote.js | 18 +++++++++--------- server/public/assets/js/player.js | 2 +- server/public/assets/js/remotecontroller.js | 1 + server/public/assets/js/search.js | 12 +++++++----- 7 files changed, 26 insertions(+), 20 deletions(-) diff --git a/gulpfile.js b/gulpfile.js index f2c7b3b6..2ae8c87b 100755 --- a/gulpfile.js +++ b/gulpfile.js @@ -5,11 +5,11 @@ var gulp = require('gulp'), gulp.task('js', function () { gulp.src(['server/VERSION.js', 'server/config/api_key.js', 'server/public/assets/js/*.js', '!server/public/assets/js/embed*', '!server/public/assets/js/token*', '!server/public/assets/js/remotecontroller.js', '!server/public/assets/js/callback.js']) - /*.pipe(uglify({ + .pipe(uglify({ mangle: true, compress: true, enclose: true - }))*/ + })) .pipe(concat('main.min.js')) .pipe(gulp.dest('server/public/assets/dist')); }); diff --git a/server/public/assets/css/style.css b/server/public/assets/css/style.css index dcd857c6..a2ef63d6 100755 --- a/server/public/assets/css/style.css +++ b/server/public/assets/css/style.css @@ -1476,7 +1476,7 @@ margin:-1px; } #inner-results { - height: calc(100vh - 64px - 76px); + height: calc(100vh - 64px); overflow-y: scroll; overflow-x: hidden; } diff --git a/server/public/assets/js/listeners.js b/server/public/assets/js/listeners.js index 9b237b37..7d829ca0 100755 --- a/server/public/assets/js/listeners.js +++ b/server/public/assets/js/listeners.js @@ -1410,8 +1410,11 @@ addListener("click", ".del_user_suggested", function(e){ }); addListener("click", '#toast-container', function(){ - var toastInstance = M.Toast.getInstance(this); - toastInstance.dismiss(); + console.log(this); + var toastElement = document.querySelector('.toast'); + var toastInstance = M.Toast.getInstance(toastElement); + toastInstance.dismiss(); + }); addListener("click", "#embed-area", function(){ diff --git a/server/public/assets/js/mobileremote.js b/server/public/assets/js/mobileremote.js index 978795ea..92675f4e 100755 --- a/server/public/assets/js/mobileremote.js +++ b/server/public/assets/js/mobileremote.js @@ -11,13 +11,13 @@ var Mobile_remote = { set_id: function(id) { Mobile_remote.id = id; - document.getElementById("#pausebutton_remote").removeAttribute("disabled"); - document.getElementById("#skipbutton_remote").removeAttribute("disabled", false); - document.getElementById("#playbutton_remote").removeAttribute("disabled", false); - document.getElementById("#skipbutton_remote").removeAttribute("disabled", false); - document.getElementById("#remote_channel").value = ""; - document.getElementById("#remote_channel").setAttribute("placeholder", "Change channel"); - document.getElementById("#remote_header").innerText = "Controlling " + id; + document.getElementById("pausebutton_remote").removeAttribute("disabled"); + document.getElementById("skipbutton_remote").removeAttribute("disabled", false); + document.getElementById("playbutton_remote").removeAttribute("disabled", false); + document.getElementById("skipbutton_remote").removeAttribute("disabled", false); + document.getElementById("remote_channel").value = ""; + document.getElementById("remote_channel").setAttribute("placeholder", "Change channel"); + document.getElementById("remote_header").innerText = "Controlling " + id; Helper.css("#volume-control-remote", "display", "inline-block"); document.querySelector(".slider-vol-mobile").setAttribute("style", "display: inline-block !important"); }, @@ -40,8 +40,8 @@ var Mobile_remote = { initiate_volume: function() { var vol = 100; - document.getElementById("#volume-control-remote").insertAdjacentHTML("beforeend", "
"); - document.getElementById("#volume-control-remote").insertAdjacentHTML("beforeend", "
"); + document.getElementById("volume-control-remote").insertAdjacentHTML("beforeend", "
"); + document.getElementById("volume-control-remote").insertAdjacentHTML("beforeend", "
"); Helper.css(".volume-slid-remote", "width", vol + "%"); Helper.css(".volume-handle-remote", "left", "calc(" + vol + "% - 1px)"); document.getElementById("volume-control-remote").addEventListener("touchstart", function(e) { diff --git a/server/public/assets/js/player.js b/server/public/assets/js/player.js index 2704cfc8..7ed208c3 100755 --- a/server/public/assets/js/player.js +++ b/server/public/assets/js/player.js @@ -753,7 +753,7 @@ var Player = { } if(!dragging) { - $("#bar").width(per+"%"); + document.getElementById("bar").style.width = per+"%"; } if(Player.player.getCurrentTime() > Player.np.end && Player.player.getPlayerState() == YT.PlayerState.PLAYING) { diff --git a/server/public/assets/js/remotecontroller.js b/server/public/assets/js/remotecontroller.js index 7ca1a97c..2f0b1713 100755 --- a/server/public/assets/js/remotecontroller.js +++ b/server/public/assets/js/remotecontroller.js @@ -1,4 +1,5 @@ var start = true; +var dynamicListeners = {}; mobilecheck = function() { var check = false; diff --git a/server/public/assets/js/search.js b/server/public/assets/js/search.js index 52beedb9..6645338a 100755 --- a/server/public/assets/js/search.js +++ b/server/public/assets/js/search.js @@ -34,7 +34,7 @@ var Search = { search: function(search_input, retried, related, pagination){ if(result_html === undefined || empty_results_html === undefined) { - result_html = document.getElementById("#temp-results-container"); + result_html = document.getElementById("temp-results-container"); empty_results_html = Helper.html("#empty-results-container"); } if(!pagination && document.querySelectorAll("#inner-results").length == 0) { @@ -84,9 +84,9 @@ var Search = { success: function(response){ response = JSON.parse(response); var output = ""; - + console.log(result_html); var pre_result = document.createElement("div"); - pre_result.innerHTML = result_html; + pre_result.innerHTML = result_html.outerHTML; //$("#results").append(result_html); @@ -104,6 +104,7 @@ var Search = { //$("#results").append(result_html); var songs = pre_result.cloneNode(true); + console.log(songs); songs.querySelector(".search-title").innerText = title; songs.querySelector(".result_info").innerText = Helper.pad(_temp_duration[0]) + ":" + Helper.pad(_temp_duration[1]); songs.querySelector(".thumb").setAttribute("src", thumb); @@ -158,13 +159,14 @@ var Search = { //setTimeout(function(){$(".thumb").lazyload({container: $("#results")});}, 250); Helper.removeClass(".search_loader_spinner", "active"); - + Helper.css(".search_results", "display", "block"); } else if(!retried){ Search.search(search_input, true); } else { //$("").appendTo($("#results")).show("blind", 83.33); - document.getElementById("results").insertAdjacentHTML("beforeend", ""); + document.getElementById("results").insertAdjacentHTML("beforeend", "
"+empty_results_html+"
"); + Helper.css("#results", "display", "block"); Helper.removeClass(".search_loader_spinner", "active"); } }