From 134bbbf6c0ea95bbb85234435c89952779483ffd Mon Sep 17 00:00:00 2001 From: Sparky Date: Sat, 23 Feb 2019 13:30:49 -0500 Subject: [PATCH 1/3] Fix volume slider not working on nowplayingbar Turns out, by wrapping the code in a function it takes the necessary bits out of scope, causing the nowplayingbar to become non-functional when it comes to adjusting volume. Fixes https://github.com/jellyfin/jellyfin/issues/988 --- .gitignore | 3 --- .../emby-webcomponents/nowplayingbar/nowplayingbar.js | 6 +++--- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index ac62bd07a1..4895d21b80 100644 --- a/.gitignore +++ b/.gitignore @@ -71,9 +71,6 @@ coverage # Grunt intermediate storage (https://gruntjs.com/creating-plugins#storing-task-files) .grunt -# Bower dependency directory (https://bower.io/) -bower_components - # node-waf configuration .lock-wscript diff --git a/src/bower_components/emby-webcomponents/nowplayingbar/nowplayingbar.js b/src/bower_components/emby-webcomponents/nowplayingbar/nowplayingbar.js index 331b178b39..481155d3b7 100644 --- a/src/bower_components/emby-webcomponents/nowplayingbar/nowplayingbar.js +++ b/src/bower_components/emby-webcomponents/nowplayingbar/nowplayingbar.js @@ -191,9 +191,9 @@ define(['require', 'datetime', 'itemHelper', 'events', 'browser', 'imageLoader', currentPlayer.setVolume(this.value); } } - volumeSlider.addEventListener('change', setVolume.bind(this)); - volumeSlider.addEventListener('mousemove', setVolume.bind(this)); - volumeSlider.addEventListener('touchmove', setVolume.bind(this)); + volumeSlider.addEventListener('change', setVolume); + volumeSlider.addEventListener('mousemove', setVolume); + volumeSlider.addEventListener('touchmove', setVolume); positionSlider = elem.querySelector('.nowPlayingBarPositionSlider'); From ae9c0a77f70f3478db4be6701d0265d068572242 Mon Sep 17 00:00:00 2001 From: redSpoutnik <15638041+redSpoutnik@users.noreply.github.com> Date: Sun, 24 Feb 2019 10:53:41 +0100 Subject: [PATCH 2/3] Go back on Media stop --- src/components/remotecontrol.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/components/remotecontrol.js b/src/components/remotecontrol.js index 58e69961e7..76f0d673d0 100644 --- a/src/components/remotecontrol.js +++ b/src/components/remotecontrol.js @@ -429,6 +429,7 @@ define(["browser", "datetime", "backdrop", "libraryBrowser", "listView", "imageL if (!state.NextMediaType) { updatePlayerState(player, dlg, {}); loadPlaylist(dlg); + Emby.Page.back(); } } From 89be94fff347e9a3b2e129be5ed8006e6e956a31 Mon Sep 17 00:00:00 2001 From: xlinbsd Date: Tue, 5 Mar 2019 13:09:32 +0100 Subject: [PATCH 3/3] Better progressive playback controls of bottom pages (#164) * Allow volume change on shrinker width screenview * Tiny better width compromise in width control fluidity * Better progressive music control panel * Delay hiding of album image displayed * Wider volume slider --- .../nowplayingbar/nowplayingbar.css | 54 ++++++++++++++----- .../nowplayingbar/nowplayingbar.js | 2 +- src/css/nowplaying.css | 22 ++++++-- src/css/videoosd.css | 11 ++-- 4 files changed, 67 insertions(+), 22 deletions(-) diff --git a/src/bower_components/emby-webcomponents/nowplayingbar/nowplayingbar.css b/src/bower_components/emby-webcomponents/nowplayingbar/nowplayingbar.css index 1392541e16..80f078d880 100644 --- a/src/bower_components/emby-webcomponents/nowplayingbar/nowplayingbar.css +++ b/src/bower_components/emby-webcomponents/nowplayingbar/nowplayingbar.css @@ -119,38 +119,66 @@ height: 1.2em !important; } -@media all and (max-width: 87.5em) { - .nowPlayingBarUserDataButtons { +@media all and (max-width: 70em) { + + .nowPlayingBarRight .nowPlayingBarUserDataButtons { display: none; } } -@media all and (max-width: 68.75em) { - - .nowPlayingBarVolumeSliderContainer, .nowPlayingBar .muteButton, .nowPlayingBar .unmuteButton { +@media all and (max-width: 66em) { + .toggleRepeatButton { display: none !important; } } -@media all and (max-width: 50em) { + +@media all and (max-width: 62em) { + + .nowPlayingBarCenter .nowPlayingBarCurrentTime { + display: none !important; + } + +} + +@media all and (max-width: 56em) { .nowPlayingBarCenter { display: none !important; } - .toggleRepeatButton { - display: none; - } } -@media all and (min-width: 50em) { + +@media all and (min-width: 56em) { .nowPlayingBarRight .playPauseButton { display: none; } - .nowPlayingBarInfoContainer { - max-width: 40%; - } +} + +@media all and (max-width: 40em) { + + .nowPlayingBarInfoContainer .nowPlayingImage { + display: none; + } + +} + +@media all and (max-width: 36em) { + + .nowPlayingBarRight .nowPlayingBarVolumeSliderContainer { + display: none !important; + } + +} + +@media all and (max-width: 24em) { + + .nowPlayingBar .muteButton, .nowPlayingBar .unmuteButton { + display: none; + } + } diff --git a/src/bower_components/emby-webcomponents/nowplayingbar/nowplayingbar.js b/src/bower_components/emby-webcomponents/nowplayingbar/nowplayingbar.js index 481155d3b7..01c920a501 100644 --- a/src/bower_components/emby-webcomponents/nowplayingbar/nowplayingbar.js +++ b/src/bower_components/emby-webcomponents/nowplayingbar/nowplayingbar.js @@ -56,7 +56,7 @@ define(['require', 'datetime', 'itemHelper', 'events', 'browser', 'imageLoader', html += ''; - html += '
'; + html += '
'; html += ''; html += '
'; diff --git a/src/css/nowplaying.css b/src/css/nowplaying.css index 93765d541b..ab8695deed 100644 --- a/src/css/nowplaying.css +++ b/src/css/nowplaying.css @@ -186,14 +186,26 @@ } .nowPlayingVolumeSliderContainer { - width: 6em + width: 9em +} + +@media all and (max-width:50em) { + .nowPlayingInfoButtons .nowPlayingPageUserDataButtons { + display: none !important + } +} + +@media all and (max-width:47em) { + .nowPlayingInfoButtons .repeatToggleButton { + display: none !important + } } @media all and (max-width:34em) { - .btnNowPlayingFastForward, - .btnNowPlayingRewind, - .playlist .listItemMediaInfo { + .nowPlayingInfoButtons .btnNowPlayingFastForward, + .nowPlayingInfoButtons .btnNowPlayingRewind, + .nowPlayingInfoButtons .playlist .listItemMediaInfo { display: none !important } -} \ No newline at end of file +} diff --git a/src/css/videoosd.css b/src/css/videoosd.css index a8904b9945..bd24e41309 100644 --- a/src/css/videoosd.css +++ b/src/css/videoosd.css @@ -138,7 +138,7 @@ } .osdVolumeSliderContainer { - width: 6.5em; + width: 9em; -webkit-box-flex: 1; -webkit-flex-grow: 1; flex-grow: 1 @@ -244,14 +244,19 @@ } } -@media all and (max-width:37.5em) { +@media all and (max-width:43em) { .videoOsdBottom .volumeButtons { display: none !important } } +@media all and (max-width:50em) { + .videoOsdBottom .btnFastForward, .videoOsdBottom .btnRewind { + display: none !important + } +} @media all and (max-width:75em) { .videoOsdBottom .endsAtText { display: none !important } -} \ No newline at end of file +}