1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin-web synced 2025-03-30 19:56:21 +00:00

update live tv config page

This commit is contained in:
Luke Pulverenti 2016-09-02 08:30:47 -04:00
parent 2737d1f9f9
commit 68bd2a782c
9 changed files with 89 additions and 57 deletions

View file

@ -14,12 +14,12 @@
}, },
"devDependencies": {}, "devDependencies": {},
"ignore": [], "ignore": [],
"version": "1.4.208", "version": "1.4.209",
"_release": "1.4.208", "_release": "1.4.209",
"_resolution": { "_resolution": {
"type": "version", "type": "version",
"tag": "1.4.208", "tag": "1.4.209",
"commit": "e7d9ca4dc8083c9dc63d5add4d73f0179369461a" "commit": "e83ed420a7c59b3d413329b046103e001ed784e5"
}, },
"_source": "https://github.com/MediaBrowser/emby-webcomponents.git", "_source": "https://github.com/MediaBrowser/emby-webcomponents.git",
"_target": "^1.2.1", "_target": "^1.2.1",

View file

@ -5,6 +5,10 @@ define(['browser'], function (browser) {
return !!(v.canPlayType && v.canPlayType('video/mp4; codecs="avc1.42E01E, mp4a.40.2"').replace(/no/, '')); return !!(v.canPlayType && v.canPlayType('video/mp4; codecs="avc1.42E01E, mp4a.40.2"').replace(/no/, ''));
} }
function canPlayH265() {
return false;
}
var _supportsTextTracks; var _supportsTextTracks;
function supportsTextTracks() { function supportsTextTracks() {
@ -257,7 +261,7 @@ define(['browser'], function (browser) {
// Only put mp3 first if mkv support is there // Only put mp3 first if mkv support is there
// Otherwise with HLS and mp3 audio we're seeing some browsers // Otherwise with HLS and mp3 audio we're seeing some browsers
if (videoTestElement.canPlayType('audio/mp4; codecs="ac-3"').replace(/no/, '') || isEdgeUniversal()) { if (videoTestElement.canPlayType('audio/mp4; codecs="ac-3"').replace(/no/, '') || isEdgeUniversal() || browser.tizen) {
// safari is lying // safari is lying
if (!browser.safari) { if (!browser.safari) {
videoAudioCodecs.push('ac3'); videoAudioCodecs.push('ac3');
@ -293,20 +297,29 @@ define(['browser'], function (browser) {
//videoAudioCodecs.push('truehd'); //videoAudioCodecs.push('truehd');
} }
var mp4VideoCodecs = [];
if (canPlayH264()) { if (canPlayH264()) {
mp4VideoCodecs.push('h264');
}
if (canPlayH265()) {
mp4VideoCodecs.push('h265');
mp4VideoCodecs.push('hevc');
}
if (mp4VideoCodecs.length) {
profile.DirectPlayProfiles.push({ profile.DirectPlayProfiles.push({
Container: 'mp4,m4v', Container: 'mp4,m4v',
Type: 'Video', Type: 'Video',
VideoCodec: 'h264', VideoCodec: mp4VideoCodecs.join(','),
AudioCodec: videoAudioCodecs.join(',') AudioCodec: videoAudioCodecs.join(',')
}); });
} }
if (canPlayMkv) { if (canPlayMkv && mp4VideoCodecs.length) {
profile.DirectPlayProfiles.push({ profile.DirectPlayProfiles.push({
Container: 'mkv', Container: 'mkv',
Type: 'Video', Type: 'Video',
VideoCodec: 'h264', VideoCodec: mp4VideoCodecs.join(','),
AudioCodec: videoAudioCodecs.join(',') AudioCodec: videoAudioCodecs.join(',')
}); });

View file

@ -4,10 +4,10 @@
} }
.formDialogHeader { .formDialogHeader {
padding: .7em .5em; padding: .8em .5em;
display: flex; display: flex;
align-items: center; align-items: center;
background-color: #101010; background-color: #222326;
flex-shrink: 0; flex-shrink: 0;
} }

View file

@ -110,11 +110,7 @@ define(['browser', 'layoutManager', 'dom', 'scrollStyles'], function (browser, l
// native scroll is a must with touch input // native scroll is a must with touch input
// also use native scroll when scrolling vertically in desktop mode - excluding horizontal because the mouse wheel support is choppy at the moment // also use native scroll when scrolling vertically in desktop mode - excluding horizontal because the mouse wheel support is choppy at the moment
// in cases with firefox, if the smooth scroll api is supported then use that because their implementation is very good // in cases with firefox, if the smooth scroll api is supported then use that because their implementation is very good
if (browser.operaTv) { if (isSmoothScrollSupported && browser.firefox) {
// no scrolling supported
options.enableNativeScroll = false;
}
else if (isSmoothScrollSupported && browser.firefox) {
// native smooth scroll // native smooth scroll
options.enableNativeScroll = true; options.enableNativeScroll = true;
} }

View file

@ -32,14 +32,14 @@
"web-component-tester": "^4.0.0", "web-component-tester": "^4.0.0",
"webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.0" "webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.0"
}, },
"homepage": "https://github.com/PolymerElements/iron-icon", "homepage": "https://github.com/polymerelements/iron-icon",
"_release": "1.0.10", "_release": "1.0.10",
"_resolution": { "_resolution": {
"type": "version", "type": "version",
"tag": "v1.0.10", "tag": "v1.0.10",
"commit": "f4e146da4982ff96bb25db85290c09e8de4ec734" "commit": "f4e146da4982ff96bb25db85290c09e8de4ec734"
}, },
"_source": "git://github.com/PolymerElements/iron-icon.git", "_source": "git://github.com/polymerelements/iron-icon.git",
"_target": "^1.0.0", "_target": "^1.0.0",
"_originalSource": "PolymerElements/iron-icon" "_originalSource": "polymerelements/iron-icon"
} }

View file

@ -27,14 +27,14 @@
}, },
"main": "iron-meta.html", "main": "iron-meta.html",
"ignore": [], "ignore": [],
"homepage": "https://github.com/PolymerElements/iron-meta", "homepage": "https://github.com/polymerelements/iron-meta",
"_release": "1.1.2", "_release": "1.1.2",
"_resolution": { "_resolution": {
"type": "version", "type": "version",
"tag": "v1.1.2", "tag": "v1.1.2",
"commit": "bae96531b63ea6d4ce982f5592248aea849c0f5a" "commit": "bae96531b63ea6d4ce982f5592248aea849c0f5a"
}, },
"_source": "git://github.com/PolymerElements/iron-meta.git", "_source": "git://github.com/polymerelements/iron-meta.git",
"_target": "^1.0.0", "_target": "^1.0.0",
"_originalSource": "PolymerElements/iron-meta" "_originalSource": "polymerelements/iron-meta"
} }

View file

@ -32,14 +32,14 @@
"iron-component-page": "polymerElements/iron-component-page#^1.1.6" "iron-component-page": "polymerElements/iron-component-page#^1.1.6"
}, },
"private": true, "private": true,
"homepage": "https://github.com/polymer/polymer", "homepage": "https://github.com/Polymer/polymer",
"_release": "1.6.1", "_release": "1.6.1",
"_resolution": { "_resolution": {
"type": "version", "type": "version",
"tag": "v1.6.1", "tag": "v1.6.1",
"commit": "1f197d9d7874b1e5808b2a5c26f34446a7d912fc" "commit": "1f197d9d7874b1e5808b2a5c26f34446a7d912fc"
}, },
"_source": "git://github.com/polymer/polymer.git", "_source": "git://github.com/Polymer/polymer.git",
"_target": "^1.1.0", "_target": "^1.1.0",
"_originalSource": "polymer/polymer" "_originalSource": "Polymer/polymer"
} }

View file

@ -99,30 +99,21 @@ define(['appStorage', 'browser'], function (appStorage, browser) {
window.msSpeechRecognition; window.msSpeechRecognition;
} }
var appInfo; function supportsFullscreen() {
var version = window.dashboardVersion || '3.0';
return { if (browser.tv) {
getWindowState: function () { return false;
return document.windowState || 'Normal'; };
},
setWindowState: function (state) {
alert('setWindowState is not supported and should not be called');
},
exit: function () {
if (browser.tizen) { var element = document.documentElement;
try {
tizen.application.getCurrentApplication().exit(); return element.requestFullscreen ||
} catch (err) { element.mozRequestFullScreen ||
console.log('error closing application: ' + err); element.webkitRequestFullscreen ||
} element.msRequestFullscreen;
return;
} }
window.close(); var supportedFeatures = function () {
},
supports: function (command) {
var features = [ var features = [
'filedownload', 'filedownload',
@ -155,7 +146,39 @@ define(['appStorage', 'browser'], function (appStorage, browser) {
//features.push('sync'); //features.push('sync');
} }
return features.indexOf(command.toLowerCase()) != -1; if (supportsFullscreen()) {
features.push('fullscreen');
}
return features;
}();
var appInfo;
var version = window.dashboardVersion || '3.0';
return {
getWindowState: function () {
return document.windowState || 'Normal';
},
setWindowState: function (state) {
alert('setWindowState is not supported and should not be called');
},
exit: function () {
if (browser.tizen) {
try {
tizen.application.getCurrentApplication().exit();
} catch (err) {
console.log('error closing application: ' + err);
}
return;
}
window.close();
},
supports: function (command) {
return supportedFeatures.indexOf(command.toLowerCase()) != -1;
}, },
unlockedFeatures: function () { unlockedFeatures: function () {

View file

@ -33,7 +33,7 @@
<div class="inputContainer"> <div class="inputContainer">
<div style="display: flex; align-items: center;"> <div style="display: flex; align-items: center;">
<div style="flex-grow:1;"> <div style="flex-grow:1;">
<input is="emby-input" id="txtRecordingPath" label="${LabelRecordingPath}" required="required" autocomplete="off" /> <input is="emby-input" id="txtRecordingPath" label="${LabelRecordingPath}" autocomplete="off" />
</div> </div>
<button type="button" is="paper-icon-button-light" id="btnSelectRecordingPath" title="${ButtonSelectDirectory}"><i class="md-icon">search</i></button> <button type="button" is="paper-icon-button-light" id="btnSelectRecordingPath" title="${ButtonSelectDirectory}"><i class="md-icon">search</i></button>
</div> </div>