From b4dc90c3eab8c2e55df7edf92c6167dc0e85be3c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kasper=20Rynning-T=C3=B8nnesen?= Date: Thu, 15 Mar 2018 15:52:33 +0100 Subject: [PATCH] Only removing channel-load on when loaded on mobile --- server/public/assets/js/functions.js | 9 ++++++--- server/public/assets/js/player.js | 4 ++-- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/server/public/assets/js/functions.js b/server/public/assets/js/functions.js index 1420593e..50c1f1ba 100644 --- a/server/public/assets/js/functions.js +++ b/server/public/assets/js/functions.js @@ -172,11 +172,12 @@ function get_list_ajax() { url: "/api/list/" + chan.toLowerCase(), success: function(response) { if(response.results.length > 0) { - $("#channel-load").remove(); if(response.status == 403) { start_auth(); } - $("#channel-load").remove(); + if(client) { + $("#channel-load").remove(); + } List.populate_list(response.results); } }, @@ -188,7 +189,9 @@ function get_list_ajax() { get_list_ajax(); }, response.getResponseHeader("Retry-After") * 1000) } - $("#channel-load").remove(); + if(client) { + $("#channel-load").remove(); + } //List.populate_list(response.responseJSON.results); } }); diff --git a/server/public/assets/js/player.js b/server/public/assets/js/player.js index 06d78255..977dc67f 100755 --- a/server/public/assets/js/player.js +++ b/server/public/assets/js/player.js @@ -288,12 +288,12 @@ var Player = { if(embed && !autoplay) autoplay = true; if(!window.MSStream) { $("#player").css("opacity", "1"); - if(!Helper.mobilecheck()) { + //if(!Helper.mobilecheck()) { $("#channel-load").css("display", "none"); /*if(Frontpage.winter && $("#snow").length == 0) { $("#video-container").prepend('
'); }*/ - } + //} } playing = true; if(beginning && Helper.mobilecheck() && !chromecastAvailable){