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

initial timeshifting support

Browse source
This commit is contained in:
Luke Pulverenti 2016-09-18 12:08:32 -04:00
parent 2971ec0e69
commit 92e4d82bd2
12 changed files with 78 additions and 62 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -5,6 +5,7 @@
border: none;
max-height: 84%;
border-radius: 1px !important;
box-shadow: 0 16px 24px 2px rgba(0, 0, 0, 0.14), 0 6px 30px 5px rgba(0, 0, 0, 0.12), 0 8px 10px -5px rgba(0, 0, 0, 0.4);
}
.actionsheet-fullscreen {

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

@ -46,7 +46,7 @@ define(['browser'], function (browser) {
}
function canPlayHlsWithMSE() {
if (window.MediaSource != null && !browser.firefox) {
if (window.MediaSource != null) {
// text tracks don’t work with this in firefox
return true;
}
@ -389,7 +389,7 @@ define(['browser'], function (browser) {
}
// Can't use mkv on mobile because we have to use the native player controls and they won't be able to seek it
if (canPlayMkv && options.supportsCustomSeeking && !browser.tizen) {
if (canPlayMkv && options.supportsCustomSeeking && !browser.tizen && options.enableMkvProgressive !== false) {
profile.TranscodingProfiles.push({
Container: 'mkv',
Type: 'Video',
@ -400,7 +400,7 @@ define(['browser'], function (browser) {
});
}
if (canPlayTs && options.supportsCustomSeeking && !browser.tizen && !browser.web0s) {
if (canPlayTs && options.supportsCustomSeeking && !browser.tizen && !browser.web0s && options.enableTsProgressive !== false) {
profile.TranscodingProfiles.push({
Container: 'ts',
Type: 'Video',
@ -414,7 +414,7 @@ define(['browser'], function (browser) {
});
}
if (canPlayHls()) {
if (canPlayHls() && options.enableHls !== false) {
profile.TranscodingProfiles.push({
Container: 'ts',
Type: 'Video',

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

@ -30,15 +30,18 @@ define(['dialogHelper', 'dom', 'layoutManager', 'scrollHelper', 'globalize', 're
formDialogContent.style['max-height'] = '60%';
scrollHelper.centerFocus.on(formDialogContent, false);
} else {
var minWidth = (Math.min(options.buttons.length * 150, dom.getWindowSize().innerWidth - 50));
dlg.style.maxWidth = (minWidth + 200) + 'px';
dlg.style.maxWidth = (Math.min((options.buttons.length * 150) + 200, dom.getWindowSize().innerWidth - 50)) + 'px';
}
//dlg.querySelector('.btnCancel').addEventListener('click', function (e) {
// dialogHelper.close(dlg);
//});
dlg.querySelector('.formDialogHeaderTitle').innerHTML = options.title || '';
if (options.title) {
dlg.querySelector('.formDialogHeaderTitle').innerHTML = options.title || '';
} else {
dlg.querySelector('.formDialogHeaderTitle').classList.add('hide');
}
dlg.querySelector('.text').innerHTML = options.html || options.text || '';

4
dashboard-ui/bower_components/emby-webcomponents/dialoghelper/dialoghelper.css vendored
View file

@ -15,12 +15,12 @@
margin: 0;
border-radius: 4px;
-webkit-font-smoothing: antialiased;
box-shadow: 0 16px 24px 2px rgba(0, 0, 0, 0.14), 0 6px 30px 5px rgba(0, 0, 0, 0.12), 0 8px 10px -5px rgba(0, 0, 0, 0.4);
border: 0;
padding: 0;
will-change: transform;
/* Strict does not work well with actionsheet */
contain: style;
box-shadow: 0 16px 24px 2px rgba(0, 0, 0, 0.14), 0 6px 30px 5px rgba(0, 0, 0, 0.12), 0 8px 10px -5px rgba(0, 0, 0, 0.4);
}
.dialog-fixedSize {
@ -37,6 +37,7 @@
left: 0;
right: 0;
margin: 0;
box-shadow: none;
}
@media all and (max-width: 1280px), all and (max-height: 720px) {
@ -47,6 +48,7 @@
left: 0 !important;
right: 0 !important;
margin: 0 !important;
box-shadow: none;
}
}