From 0f16361f6dff7423a03b7dab559103ebd81b3985 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kasper=20Rynning-T=C3=B8nnesen?= Date: Wed, 6 Nov 2019 09:40:42 +0100 Subject: [PATCH] More compliances --- gulpfile.js | 4 +-- server/public/assets/css/mobile.css | 37 +++++++++++++++++++++------- server/public/assets/js/functions.js | 1 + server/public/assets/js/player.js | 25 ++++++++++--------- 4 files changed, 45 insertions(+), 22 deletions(-) diff --git a/gulpfile.js b/gulpfile.js index 7b9134ce..33096af6 100755 --- a/gulpfile.js +++ b/gulpfile.js @@ -38,13 +38,13 @@ gulp.task("js", function() { ]) //.pipe(sourcemaps.init()) .pipe(concat("main.min.js")) - .pipe( + /*.pipe( uglify({ mangle: true, compress: true, enclose: true }) - ) + )*/ //.pipe(sourcemaps.write('maps')) .pipe(gulp.dest("server/public/assets/dist")) ); diff --git a/server/public/assets/css/mobile.css b/server/public/assets/css/mobile.css index 71be6901..82ad01a3 100644 --- a/server/public/assets/css/mobile.css +++ b/server/public/assets/css/mobile.css @@ -161,6 +161,22 @@ text-align: center; } + #main_components { + display: block; + } + + #duration, + #playpause, + .playbar-btn.skip, + #volume-button, + #bar { + display: none; + } + + .cast-button-header { + height: 56px; + } + .slider-vol-mobile { display: none !important; } @@ -299,10 +315,19 @@ #player { height: calc(100%); - display: none; + /*display: none;*/ + pointer-events: all !important; + opacity: 1 !important; + display: block !important; width: 100vw; } + #search-btn { + position: absolute; + top: 56px; + right: 10px; + } + .pointer-events-all-mobile { pointer-events: all !important; } @@ -430,12 +455,6 @@ float: right; } - .castButton { - width: 39px; - height: 51px; - padding-top: 0em; - } - .label-for-mobile-frontpage { display: initial; width: auto !important; @@ -552,7 +571,7 @@ width: auto; } - .page-footer { + footer { padding-top: 40px !important; } @@ -597,7 +616,7 @@ } #player { - pointer-events: none; + /*pointer-events: none;*/ margin-top: 7px; } diff --git a/server/public/assets/js/functions.js b/server/public/assets/js/functions.js index b1b15894..fbaea8fa 100644 --- a/server/public/assets/js/functions.js +++ b/server/public/assets/js/functions.js @@ -1441,6 +1441,7 @@ function resizePlaylistPlaying(playing, resizing) { if (document.querySelector("#wrapper") == null || embed || client) return; if (window.innerWidth < 601) { var subtract = 0; + playing = true; if (playing) { var height = window.innerHeight - 246 - 170 - subtract; Helper.css("#chat-bar", "height", height + "px"); diff --git a/server/public/assets/js/player.js b/server/public/assets/js/player.js index de217231..614ff91c 100755 --- a/server/public/assets/js/player.js +++ b/server/public/assets/js/player.js @@ -199,9 +199,9 @@ var Player = { } if (!embed && !client && window.location.pathname != "/") { if (Helper.mobilecheck()) { - Helper.css("#player", "display", "block"); - Helper.toggleClass(".video-container", "click-through"); - Helper.toggleClass(".page-footer", "padding-bottom-extra"); + /*Helper.css("#player", "display", "block"); + Helper.toggleClass(".video-container", "click-through");*/ + //Helper.toggleClass(".page-footer", "padding-bottom-extra"); } resizePlaylistPlaying( newState.data == YT.PlayerState.PLAYING || @@ -213,8 +213,8 @@ var Player = { Helper.css("#player", "opacity", "1"); Helper.css("#channel-load", "display", "none"); - Helper.addClass("#player", "pointer-events-all-mobile"); - Helper.removeClass("#video-container", "click-through"); + //Helper.addClass("#player", "pointer-events-all-mobile"); + //Helper.removeClass("#video-container", "click-through"); Helper.addClass("#player", "small-display"); Helper.css("#playpause", "visibility", "visible"); Helper.css("#playpause", "pointer-events", "all"); @@ -266,9 +266,9 @@ var Player = { mobile_beginning = true; if (!embed && !client && window.location.pathname != "/") { if (Helper.mobilecheck() && !embed) { - Helper.css("#player", "display", "none"); + /*Helper.css("#player", "display", "none"); Helper.toggleClass(".video-container", "click-through"); - Helper.toggleClass(".page-footer", "padding-bottom-extra"); + Helper.toggleClass(".page-footer", "padding-bottom-extra");*/ } resizePlaylistPlaying( @@ -279,9 +279,9 @@ var Player = { } } } - Helper.removeClass("#player", "pointer-events-all-mobile"); - Helper.addClass("#video-container", "click-through"); - Helper.removeClass("#player", "small-display"); + //Helper.removeClass("#player", "pointer-events-all-mobile"); + //Helper.addClass("#video-container", "click-through"); + //Helper.removeClass("#player", "small-display"); break; case YT.PlayerState.BUFFERING: //was_stopped = false; @@ -1062,7 +1062,7 @@ var Player = { if (Helper.mobilecheck()) { /*Helper.css("#playpause", "visibility", "hidden"); Helper.css("#playpause", "pointer-events", "none");*/ - Helper.css("#player", "opacity", "1"); + //Helper.css("#player", "opacity", "1"); if (offline) { setTimeout(function() { Helper.css("#channel-load", "display", "none"); @@ -1222,6 +1222,9 @@ var Player = { }, onYouTubeIframeAPIReady: function() { + if (Helper.mobilecheck()) { + resizePlaylistPlaying(true, false); + } try { Player.player = new YT.Player("player", { videoId: video_id,