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

fix remote control stopping playback

Browse source
This commit is contained in:
Luke Pulverenti 2016-10-27 13:29:40 -04:00
parent 1f1475c2f1
commit 6c735c55a9
11 changed files with 84 additions and 60 deletions
Download patch file Download diff file Expand all files Collapse all files

14
dashboard-ui/scripts/mediaplayer.js
View file

@ -434,26 +434,26 @@ define(['appSettings', 'userSettings', 'appStorage', 'datetime'], function (appS
Dashboard.showLoadingMsg();
Dashboard.getCurrentUser().then(function (user) {
return Dashboard.getCurrentUser().then(function (user) {
if (options.items) {
translateItemsForPlayback(options.items, true).then(function (items) {
return translateItemsForPlayback(options.items, true).then(function (items) {
self.playWithIntros(items, options, user);
return self.playWithIntros(items, options, user);
});
} else {
self.getItemsForPlayback({
return self.getItemsForPlayback({
Ids: options.ids.join(',')
}).then(function (result) {
translateItemsForPlayback(result.Items, true).then(function (items) {
return translateItemsForPlayback(result.Items, true).then(function (items) {
self.playWithIntros(items, options, user);
return self.playWithIntros(items, options, user);
});
});
@ -489,6 +489,8 @@ define(['appSettings', 'userSettings', 'appStorage', 'datetime'], function (appS
});
});
// Todo: rework above methods to use promises
return Promise.resolve();
};
function getOptimalMediaSource(mediaType, versions) {