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

3
dashboard-ui/bower_components/emby-webcomponents/actionsheet/actionsheet.css vendored
View file

@ -12,6 +12,7 @@
background-color: #121314; background-color: #121314;
max-width: 90%; max-width: 90%;
max-height: 90%; max-height: 90%;
color: #eee;
} }
.actionSheetMenuItem:hover { .actionSheetMenuItem:hover {
@ -103,7 +104,7 @@
} }
.actionsheet-extraSpacing { .actionsheet-extraSpacing {
font-size: 108%; font-size: 112%;
} }
.btnCloseActionSheet { .btnCloseActionSheet {

23
dashboard-ui/bower_components/emby-webcomponents/actionsheet/actionsheet.js vendored
View file

@ -114,7 +114,7 @@
dialogOptions.entryAnimation = options.entryAnimation; dialogOptions.entryAnimation = options.entryAnimation;
dialogOptions.exitAnimation = options.exitAnimation; dialogOptions.exitAnimation = options.exitAnimation;
dialogOptions.entryAnimationDuration = options.entryAnimationDuration || 140; dialogOptions.entryAnimationDuration = options.entryAnimationDuration || 140;
dialogOptions.exitAnimationDuration = options.exitAnimationDuration || 180; dialogOptions.exitAnimationDuration = options.exitAnimationDuration || 160;
dialogOptions.autoFocus = false; dialogOptions.autoFocus = false;
} }
@ -301,13 +301,22 @@
dialogHelper.open(dlg); dialogHelper.open(dlg);
var pos = options.positionTo && dialogOptions.size !== 'fullscreen' ? getPosition(options, dlg) : null; // Make sure the above open has completed so that we can query offsetWidth and offsetHeight
// This was needed in safari, but in chrome this is causing the dialog to change position while animating
var setPositions = function () {
var pos = options.positionTo && dialogOptions.size !== 'fullscreen' ? getPosition(options, dlg) : null;
if (pos) { if (pos) {
dlg.style.position = 'fixed'; dlg.style.position = 'fixed';
dlg.style.margin = 0; dlg.style.margin = 0;
dlg.style.left = pos.left + 'px'; dlg.style.left = pos.left + 'px';
dlg.style.top = pos.top + 'px'; dlg.style.top = pos.top + 'px';
}
};
if (browser.safari) {
setTimeout(setPositions, 0);
} else {
setPositions();
} }
}); });
} }

3
dashboard-ui/bower_components/emby-webcomponents/browserdeviceprofile.js vendored
View file

@ -416,7 +416,8 @@ define(['browser'], function (browser) {
VideoCodec: 'h264', VideoCodec: 'h264',
Context: 'Streaming', Context: 'Streaming',
Protocol: 'hls', Protocol: 'hls',
MaxAudioChannels: physicalAudioChannels.toString() MaxAudioChannels: physicalAudioChannels.toString(),
EnableSplittingOnNonKeyFrames: browser.safari ? true : false
}); });
} }

2
dashboard-ui/bower_components/emby-webcomponents/collectioneditor/collectioneditor.js vendored
View file

@ -148,8 +148,10 @@
html += '<div class="fldSelectCollection">'; html += '<div class="fldSelectCollection">';
html += '<br/>'; html += '<br/>';
html += '<br/>'; html += '<br/>';
html += '<div class="selectContainer">';
html += '<select is="emby-select" label="' + globalize.translate('sharedcomponents#LabelCollection') + '" id="selectCollectionToAddTo" autofocus></select>'; html += '<select is="emby-select" label="' + globalize.translate('sharedcomponents#LabelCollection') + '" id="selectCollectionToAddTo" autofocus></select>';
html += '</div>'; html += '</div>';
html += '</div>';
html += '<div class="newCollectionInfo">'; html += '<div class="newCollectionInfo">';

2
dashboard-ui/bower_components/emby-webcomponents/playlisteditor/playlisteditor.js vendored
View file

@ -140,7 +140,7 @@
html += '<div class="dialogContentInner dialog-content-centered">'; html += '<div class="dialogContentInner dialog-content-centered">';
html += '<form style="margin:auto;">'; html += '<form style="margin:auto;">';
html += '<div class="fldSelectPlaylist">'; html += '<div class="fldSelectPlaylist selectContainer">';
html += '<select is="emby-select" id="selectPlaylistToAddTo" label="' + globalize.translate('sharedcomponents#LabelPlaylist') + '" autofocus></select>'; html += '<select is="emby-select" id="selectPlaylistToAddTo" label="' + globalize.translate('sharedcomponents#LabelPlaylist') + '" autofocus></select>';
html += '</div>'; html += '</div>';

5
dashboard-ui/bower_components/emby-webcomponents/registrationservices/registrationservices.js vendored
View file

@ -598,6 +598,11 @@
function showPremiereInfo() { function showPremiereInfo() {
if (appHost.supports('externalpremium')) {
showExternalPremiereInfo();
return Promise.resolve();
}
return iapManager.getSubscriptionOptions().then(function (subscriptionOptions) { return iapManager.getSubscriptionOptions().then(function (subscriptionOptions) {
var dialogOptions = { var dialogOptions = {

10
dashboard-ui/components/dockedtabs/dockedtabs.css
View file

@ -36,16 +36,6 @@
font-size: 20px; font-size: 20px;
} }
.dockedtabs-dlg {
font-size: inherit !important;
background-color: #222 !important;
color: #eee;
}
.dockedtabs-dlg-menuitem:hover {
background-color: #333 !important;
}
@media all and (max-width: 800px) { @media all and (max-width: 800px) {
.dockedtab-midsize { .dockedtab-midsize {
display: none !important; display: none !important;

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

@ -98,7 +98,10 @@
}).then(function (result) { }).then(function (result) {
renderItems(page, result.Items, 'activeProgramItems', 'play'); renderItems(page, result.Items, 'activeProgramItems', 'play', {
showAirDateTime: false,
showAirEndTime: true
});
Dashboard.hideLoadingMsg(); Dashboard.hideLoadingMsg();
}); });
} }
@ -151,7 +154,10 @@
}).then(function (result) { }).then(function (result) {
renderItems(page, result.Items, 'upcomingTvMovieItems', null, getPortraitShape()); renderItems(page, result.Items, 'upcomingTvMovieItems', null, {
shape: getPortraitShape(),
preferThumb: null
});
}); });
ApiClient.getLiveTvRecommendedPrograms({ 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 supportsImageAnalysis = appHost.supports('imageanalysis');
var html = cardBuilder.getCardsHtml({ cardOptions = cardOptions || {};
var html = cardBuilder.getCardsHtml(Object.assign({
items: items, items: items,
preferThumb: !shape, preferThumb: true,
inheritThumb: false, inheritThumb: false,
shape: shape || (enableScrollX() ? 'overflowBackdrop' : 'backdrop'), shape: (enableScrollX() ? 'overflowBackdrop' : 'backdrop'),
showParentTitleOrTitle: true, showParentTitleOrTitle: true,
showTitle: false, showTitle: false,
centerText: !supportsImageAnalysis, centerText: !supportsImageAnalysis,
@ -210,7 +218,8 @@
showChannelName: true, showChannelName: true,
vibrant: true, vibrant: true,
cardLayout: supportsImageAnalysis cardLayout: supportsImageAnalysis
});
}, cardOptions));
var elem = page.querySelector('.' + sectionClass); 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) { if (!AppInfo.isNativeApp) {
options.enableMkvProgressive = item.RunTimeTicks != null; options.enableMkvProgressive = item.RunTimeTicks != null;
options.enableHls = !browserInfo.firefox || item.RunTimeTicks == null;
if (item.RunTimeTicks == null) {
options.enableHls = true;
}
options.disableVideoAudioCodecs = disableVideoAudioCodecs; options.disableVideoAudioCodecs = disableVideoAudioCodecs;
} }

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

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