milas/jellyfish-web
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

update now playing screen

Browse source
This commit is contained in:
Luke Pulverenti 2017-01-24 00:52:47 -05:00
parent 52e8f36d41
commit 3b258484af
7 changed files with 106 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

9
dashboard-ui/bower_components/emby-webcomponents/playback/playbackmanager.js vendored
View file

@ -1118,9 +1118,8 @@ define(['events', 'datetime', 'appSettings', 'pluginManager', 'userSettings', 'g
var apiClient = connectionManager.getApiClient(item.ServerId);
if (item.LocalTrailerCount) {
apiClient.getLocalTrailers(apiClient.getCurrentUserId(), item.Id).then(function (result) {
self.play({
return apiClient.getLocalTrailers(apiClient.getCurrentUserId(), item.Id).then(function (result) {
return self.play({
items: result
});
});
@ -1128,10 +1127,10 @@ define(['events', 'datetime', 'appSettings', 'pluginManager', 'userSettings', 'g
var remoteTrailers = item.RemoteTrailers || [];
if (!remoteTrailers.length) {
return;
return Promise.reject();
}
self.play({
return self.play({
items: remoteTrailers.map(function (t) {
return {
Name: t.Name || (item.Name + ' Trailer'),