mirrors/jellyfin-web
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin-web synced 2025-03-30 19:56:21 +00:00
Code Activity

Merge pull request #163 from jellyfin/release-10.2.z

Browse source 
Backmerge for 10.2.2
This commit is contained in:
Anthony Lavado 2019-03-04 01:19:09 -05:00 • committed by GitHub
commit 36ab9764ac
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

3
.gitignore vendored
View file

@ -71,9 +71,6 @@ coverage
# Grunt intermediate storage (https://gruntjs.com/creating-plugins#storing-task-files) # Grunt intermediate storage (https://gruntjs.com/creating-plugins#storing-task-files)
.grunt .grunt
# Bower dependency directory (https://bower.io/)
bower_components
# node-waf configuration # node-waf configuration
.lock-wscript .lock-wscript

6
src/bower_components/emby-webcomponents/nowplayingbar/nowplayingbar.js vendored
View file

@ -191,9 +191,9 @@ define(['require', 'datetime', 'itemHelper', 'events', 'browser', 'imageLoader',
currentPlayer.setVolume(this.value); currentPlayer.setVolume(this.value);
} }
} }
volumeSlider.addEventListener('change', setVolume.bind(this)); volumeSlider.addEventListener('change', setVolume);
volumeSlider.addEventListener('mousemove', setVolume.bind(this)); volumeSlider.addEventListener('mousemove', setVolume);
volumeSlider.addEventListener('touchmove', setVolume.bind(this)); volumeSlider.addEventListener('touchmove', setVolume);
positionSlider = elem.querySelector('.nowPlayingBarPositionSlider'); positionSlider = elem.querySelector('.nowPlayingBarPositionSlider');

1
src/components/remotecontrol.js
View file

@ -429,6 +429,7 @@ define(["browser", "datetime", "backdrop", "libraryBrowser", "listView", "imageL
if (!state.NextMediaType) { if (!state.NextMediaType) {
updatePlayerState(player, dlg, {}); updatePlayerState(player, dlg, {});
loadPlaylist(dlg); loadPlaylist(dlg);
Emby.Page.back();
} }
} }