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

rework result factory

This commit is contained in:
Luke Pulverenti 2016-11-10 09:41:24 -05:00
parent 2839c095b4
commit 41c7f70286
5 changed files with 25 additions and 27 deletions

View file

@ -394,14 +394,16 @@ define(['browser'], function (browser) {
Type: 'Audio', Type: 'Audio',
AudioCodec: audioFormat, AudioCodec: audioFormat,
Context: 'Streaming', Context: 'Streaming',
Protocol: 'http' Protocol: 'http',
MaxAudioChannels: physicalAudioChannels.toString()
}); });
profile.TranscodingProfiles.push({ profile.TranscodingProfiles.push({
Container: audioFormat, Container: audioFormat,
Type: 'Audio', Type: 'Audio',
AudioCodec: audioFormat, AudioCodec: audioFormat,
Context: 'Static', Context: 'Static',
Protocol: 'http' Protocol: 'http',
MaxAudioChannels: physicalAudioChannels.toString()
}); });
}); });
@ -489,14 +491,6 @@ define(['browser'], function (browser) {
profile.ContainerProfiles = []; profile.ContainerProfiles = [];
profile.CodecProfiles = []; profile.CodecProfiles = [];
profile.CodecProfiles.push({
Type: 'Audio',
Conditions: [{
Condition: 'LessThanEqual',
Property: 'AudioChannels',
Value: '2'
}]
});
// Handle he-aac not supported // Handle he-aac not supported
if (!videoTestElement.canPlayType('video/mp4; codecs="avc1.640029, mp4a.40.5"').replace(/no/, '')) { if (!videoTestElement.canPlayType('video/mp4; codecs="avc1.640029, mp4a.40.5"').replace(/no/, '')) {
@ -552,6 +546,12 @@ define(['browser'], function (browser) {
Value: 'true', Value: 'true',
IsRequired: false IsRequired: false
}, },
{
Condition: 'NotEquals',
Property: 'IsAVC',
Value: 'true',
IsRequired: false
},
{ {
Condition: 'EqualsAny', Condition: 'EqualsAny',
Property: 'VideoProfile', Property: 'VideoProfile',

View file

@ -2,7 +2,6 @@
display: block; display: block;
margin: 0; margin: 0;
margin-bottom: 0 !important; margin-bottom: 0 !important;
background: none;
border: 1px solid #383838; border: 1px solid #383838;
border-width: 0 0 1px 0; border-width: 0 0 1px 0;
/* Prefixed box-sizing rules necessary for older browsers */ /* Prefixed box-sizing rules necessary for older browsers */
@ -15,17 +14,21 @@
/* General select styles: change as needed */ /* General select styles: change as needed */
font-family: inherit; font-family: inherit;
font-weight: inherit; font-weight: inherit;
color: inherit;
padding: .35em .8em .3em 0; padding: .35em .8em .3em 0;
cursor: pointer; cursor: pointer;
outline: none !important; outline: none !important;
width: 100%; width: 100%;
}
.emby-select-withoptioncolor {
color: inherit;
background: none;
-webkit-appearance: none; -webkit-appearance: none;
-moz-appearance: none; -moz-appearance: none;
appearance: none; appearance: none;
} }
.emby-select option { .emby-select-withoptioncolor > option {
color: initial; color: initial;
} }

View file

@ -118,6 +118,10 @@
inputId++; inputId++;
} }
if (!browser.firefox) {
this.classList.add('emby-select-withoptioncolor');
}
this.addEventListener('mousedown', onMouseDown); this.addEventListener('mousedown', onMouseDown);
this.addEventListener('keydown', onKeyDown); this.addEventListener('keydown', onKeyDown);

View file

@ -123,7 +123,11 @@ h1 a:hover {
background-color: #fff; background-color: #fff;
} }
.ui-body-a select, .ui-body-a [is="emby-input"], .ui-body-a [is="emby-textarea"] { .ui-body-a [is="emby-select"] {
border-color: #ccc !important;
}
.ui-body-a [is="emby-input"], .ui-body-a [is="emby-textarea"] {
background: none; background: none;
border-color: #ccc !important; border-color: #ccc !important;
} }
@ -350,15 +354,6 @@ div[data-role='page'] {
color: #bbb; color: #bbb;
} }
.ui-body-a select {
background: none;
border-color: #757575;
}
.ui-body-a select option {
color: #000;
}
.ui-body-a .emby-collapsible-button { .ui-body-a .emby-collapsible-button {
border-color: #ddd; border-color: #ddd;
} }

View file

@ -6,10 +6,6 @@ body:not(.dashboardDocument) .mainDrawerButton {
display: none !important; display: none !important;
} }
.ui-body-b select {
-webkit-appearance: none;
}
.pageWithAbsoluteTabs:not(.noSecondaryNavPage) { .pageWithAbsoluteTabs:not(.noSecondaryNavPage) {
padding-top: 88px !important; padding-top: 88px !important;
} }