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

update recording defaults

Browse source
This commit is contained in:
Luke Pulverenti 2016-10-16 13:11:32 -04:00
parent 14bce4eaf7
commit f8eb80550a
10 changed files with 51 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

23
dashboard-ui/scripts/livetvsuggested.js
View file

@ -98,7 +98,10 @@
}).then(function (result) {
renderItems(page, result.Items, 'activeProgramItems', 'play');
renderItems(page, result.Items, 'activeProgramItems', 'play', {
showAirDateTime: false,
showAirEndTime: true
});
Dashboard.hideLoadingMsg();
});
}
@ -151,7 +154,10 @@
}).then(function (result) {
renderItems(page, result.Items, 'upcomingTvMovieItems', null, getPortraitShape());
renderItems(page, result.Items, 'upcomingTvMovieItems', null, {
shape: getPortraitShape(),
preferThumb: null
});
});
ApiClient.getLiveTvRecommendedPrograms({
@ -187,15 +193,17 @@
});
}
function renderItems(page, items, sectionClass, overlayButton, shape) {
function renderItems(page, items, sectionClass, overlayButton, cardOptions) {
var supportsImageAnalysis = appHost.supports('imageanalysis');
var html = cardBuilder.getCardsHtml({
cardOptions = cardOptions || {};
var html = cardBuilder.getCardsHtml(Object.assign({
items: items,
preferThumb: !shape,
preferThumb: true,
inheritThumb: false,
shape: shape || (enableScrollX() ? 'overflowBackdrop' : 'backdrop'),
shape: (enableScrollX() ? 'overflowBackdrop' : 'backdrop'),
showParentTitleOrTitle: true,
showTitle: false,
centerText: !supportsImageAnalysis,
@ -210,7 +218,8 @@
showChannelName: true,
vibrant: true,
cardLayout: supportsImageAnalysis
});
}, cardOptions));
var elem = page.querySelector('.' + sectionClass);

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

@ -157,7 +157,11 @@ define(['appSettings', 'userSettings', 'appStorage', 'datetime'], function (appS
if (!AppInfo.isNativeApp) {
options.enableMkvProgressive = item.RunTimeTicks != null;
options.enableHls = !browserInfo.firefox || item.RunTimeTicks == null;
if (item.RunTimeTicks == null) {
options.enableHls = true;
}
options.disableVideoAudioCodecs = disableVideoAudioCodecs;
}

4
dashboard-ui/scripts/site.js
View file

@ -1614,8 +1614,8 @@ var AppInfo = {};
var embyWebComponentsBowerPath = bowerPath + '/emby-webcomponents';
if (Dashboard.isRunningInCordova() && browser.safari) {
paths.actionsheet = "cordova/actionsheet";
if (Dashboard.isRunningInCordova()) {
define("actionsheet", ["cordova/actionsheet"], returnFirstDependency);
} else {
define("actionsheet", ["webActionSheet"], returnFirstDependency);
}