From dde0586ca3669327fbd017799f6230d741d40342 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kasper=20Rynning-T=C3=B8nnesen?= Date: Mon, 29 Oct 2018 14:47:58 +0100 Subject: [PATCH 1/2] Moved some settings to a separate accordion to gather stuff mroe --- server/public/assets/js/channel.js | 4 +- server/public/assets/js/functions.js | 7 ++ .../public/partials/channel/panel.handlebars | 77 +++++++++---------- 3 files changed, 48 insertions(+), 40 deletions(-) diff --git a/server/public/assets/js/channel.js b/server/public/assets/js/channel.js index 50c3f6cf..83099f51 100644 --- a/server/public/assets/js/channel.js +++ b/server/public/assets/js/channel.js @@ -179,7 +179,9 @@ var Channel = { } if(!Helper.mobilecheck() && (document.querySelectorAll("#alreadychannel").length === 0 || !Hostcontroller.old_id || document.getElementById("code-text").innerText.toUpperCase() == "ABBADUR")) setup_host_initialization(); setup_suggested_listener(); - if(!Helper.mobilecheck()) Helper.removeClass(".intelligent-accordion", "hide-on-small-only"); + if(!Helper.mobilecheck()) { + showOnSmallNotMobile(); + } if(document.querySelectorAll("#alreadychannel").length === 0 || Helper.mobilecheck()){ setup_now_playing_listener(); get_list_listener(); diff --git a/server/public/assets/js/functions.js b/server/public/assets/js/functions.js index f0aa3031..28612bf9 100644 --- a/server/public/assets/js/functions.js +++ b/server/public/assets/js/functions.js @@ -611,6 +611,13 @@ function loadChromecastVideo() { }); } +function showOnSmallNotMobile() { + var elements = document.querySelectorAll(".hide-on-mobile-only"); + for(var i = 0; i < elements.length; i++) { + Helper.removeClass(elements[i], "hide-on-small-only"); + } +} + function enable_intelligent_list() { if(Crypt.get_intelligent_list_enabled()) { intelligentList = true; diff --git a/server/public/partials/channel/panel.handlebars b/server/public/partials/channel/panel.handlebars index 071a0876..7306afb8 100755 --- a/server/public/partials/channel/panel.handlebars +++ b/server/public/partials/channel/panel.handlebars @@ -25,13 +25,13 @@ -
  • -
    Intelligent Playlist - sentiment_satisfied_alt +
  • +
    Client Settings + settings
      -
    • +
    • Intelligent @@ -42,11 +42,44 @@ Enabled
    +
    • + {{#unless client}} +
  • + + Enable Remote + +
    + +
    +
    • +
  • + + Local Mode + +
    + +
    +
    • + {{/unless}} +
  • -

    +

    When enabling intelligent playlist, playlist elements are not updated and moved around when the playlist is in focus. If things are jumping too much around in the playlist when voting, you should enable this.

    + {{#unless client}} +

    + By enabling local mode, you won't receive updates in position of the currently playing song, you'll be able to vote as many times as you please, and you can skip to a specific location in the song. +

    + {{/unless}}
    • @@ -61,16 +94,6 @@
    -
  • -
    Local Mode - visibility_off -
    -
    -
      -
    • - - Local Mode - -
      - -
      -
      - By enabling local mode, you won't receive updates in position of the currently playing song, you'll be able to vote as many times as you please, and you can skip to a specific location in the song. -
      -
      • -
    -
    -
  • Host Mode hearing From d684efe405465f97d5d18b08ecdb5e9e6c47a2dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kasper=20Rynning-T=C3=B8nnesen?= Date: Mon, 29 Oct 2018 14:59:26 +0100 Subject: [PATCH 2/2] Removed enable remote from enable remote switch --- server/public/partials/channel/panel.handlebars | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/public/partials/channel/panel.handlebars b/server/public/partials/channel/panel.handlebars index 7306afb8..b7bab0e0 100755 --- a/server/public/partials/channel/panel.handlebars +++ b/server/public/partials/channel/panel.handlebars @@ -46,7 +46,7 @@ {{#unless client}}
  • - Enable Remote + Remote