From 134bbbf6c0ea95bbb85234435c89952779483ffd Mon Sep 17 00:00:00 2001 From: Sparky Date: Sat, 23 Feb 2019 13:30:49 -0500 Subject: [PATCH 1/2] 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/2] 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(); } }