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

Backmerge for 10.2.2
This commit is contained in:
Anthony Lavado
2019-03-04 01:19:09 -05:00
committed by GitHub
3 changed files with 4 additions and 6 deletions
-3
View File
@@ -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
@@ -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');
+1
View File
@@ -429,6 +429,7 @@ define(["browser", "datetime", "backdrop", "libraryBrowser", "listView", "imageL
if (!state.NextMediaType) {
updatePlayerState(player, dlg, {});
loadPlaylist(dlg);
Emby.Page.back();
}
}