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 remote-tracking branch 'upstream/master' into patch-10

Browse source
This commit is contained in:
ferferga 2020-04-04 12:56:08 +02:00
commit a461f16332
169 changed files with 11856 additions and 5175 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/components/playback/brightnessosd.js
View file

@ -98,15 +98,22 @@ define(['events', 'playbackManager', 'dom', 'browser', 'css!./iconosd', 'materia
}
}
function setIcon(iconElement, icon) {
iconElement.classList.remove('brightness_high');
iconElement.classList.remove('brightness_medium');
iconElement.classList.remove('brightness_low');
iconElement.classList.add(icon);
}
function updateElementsFromPlayer(brightness) {
if (iconElement) {
if (brightness >= 80) {
iconElement.innerHTML = '';
setIcon(iconElement, 'brightness_high');
} else if (brightness >= 20) {
iconElement.innerHTML = '';
setIcon(iconElement, 'brightness_medium');
} else {
iconElement.innerHTML = '';
setIcon(iconElement, 'brightness_low');
}
}
if (progressElement) {

6
src/components/playback/playbackmanager.js
View file

@ -3162,7 +3162,8 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
// User clicked stop or content ended
var state = self.getPlayerState(player);
var streamInfo = getPlayerData(player).streamInfo;
var data = getPlayerData(player);
var streamInfo = data.streamInfo;
var nextItem = self._playNextAfterEnded ? self._playQueueManager.getNextItemInfo() : null;
@ -3210,6 +3211,9 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
showPlaybackInfoErrorMessage(self, displayErrorCode, nextItem);
} else if (nextItem) {
self.nextTrack();
} else {
// Nothing more to play - clear data
data.streamInfo = null;
}
}