Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: settings menu simplified #35

Merged
merged 2 commits into from
Aug 31, 2017
Merged

fix: settings menu simplified #35

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7f96e5b
fix: settings menu simplified, filter out video and audio tracks that
Aug 31, 2017
940e265
eslint fix
Aug 31, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
119 changes: 32 additions & 87 deletions src/components/language/language.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ import SmartContainer from '../smart-container';
import SmartContainerItem from '../smart-container/smart-container-item';
import { default as Icon, IconType } from '../icon';
import CVAAOverlay from '../cvaa-overlay';
import Menu from '../menu';
import Portal from 'preact-portal';

/**
Expand Down Expand Up @@ -144,63 +143,7 @@ class LanguageControl extends BaseComponent {
}

/**
* render menu with audio settings only
*
* @param {Array<Object>} audioOptions - audio tracks
* @returns {React$Element} component element
* @memberof LanguageControl
*/
renderAudioSettingsOnly(audioOptions: Array<Object>): React$Element<any> {
return (
<div className='control-button-container control-audio'>
<button
className={this.state.smartContainerOpen ? 'control-button active' : 'control-button'}
onClick={() => this.onControlButtonClick()}
>
<Icon type={IconType.Language} />
</button>
{ !this.state.smartContainerOpen && !this.props.isMobile ? undefined :
<Menu
hideSelect
options={audioOptions}
onSelect={(o) => this.onAudioChange(o)}
onClose={() => this.setState({smartContainerOpen: false})}
/>
}
</div>
)
}

/**
* render menu with text settings only
*
* @param {Array<Object>} textOptions - text tracks
* @returns {React$Element} - component element
* @memberof LanguageControl
*/
renderTextSettingsOnly(textOptions: Array<Object>): React$Element<any> {
return (
<div className='control-button-container control-audio'>
<button
className={this.state.smartContainerOpen ? 'control-button active' : 'control-button'}
onClick={() => this.onControlButtonClick()}
>
<Icon type={IconType.Language} />
</button>
{ !this.state.smartContainerOpen && !this.props.isMobile ? undefined :
<Menu
hideSelect
options={textOptions}
onSelect={(o) => this.onCaptionsChange(o)}
onClose={() => this.setState({smartContainerOpen: false})}
/>
}
</div>
)
}

/**
* render smart container with both audio and text options
* render smart container with both audio and text options if exist
*
* @param {Array<Object>} audioOptions - audio tracks
* @param {Array<Object>} textOptions - text tracks
Expand All @@ -224,27 +167,33 @@ class LanguageControl extends BaseComponent {
</Localizer>
{ !this.state.smartContainerOpen || this.state.cvaaOverlay ? undefined :
<SmartContainer title='Language' onClose={() => this.onControlButtonClick()}>
<Localizer>
<SmartContainerItem
icon='audio'
label={<Text id='language.audio' />}
options={audioOptions}
onSelect={audioTrack => this.onAudioChange(audioTrack)}
/>
</Localizer>
<Localizer>
<SmartContainerItem
icon='captions'
label={<Text id='language.captions' />}
options={textOptions}
onSelect={textTrack => this.onCaptionsChange(textTrack)}
/>
</Localizer>
<div className='smart-container-item'>
<a onClick={() => this.toggleCVAAOverlay()}>
<Text id='language.advanced_captions_settings' />
</a>
</div>
{ audioOptions.length === 0 ? undefined :
<Localizer>
<SmartContainerItem
icon='audio'
label={<Text id='language.audio' />}
options={audioOptions}
onSelect={audioTrack => this.onAudioChange(audioTrack)}
/>
</Localizer>
}
{ textOptions.length === 0 ? undefined :
<Localizer>
<SmartContainerItem
icon='captions'
label={<Text id='language.captions' />}
options={textOptions}
onSelect={textTrack => this.onCaptionsChange(textTrack)}
/>
</Localizer>
}
{ textOptions.length === 0 ? undefined :
<div className='smart-container-item'>
<a onClick={() => this.toggleCVAAOverlay()}>
<Text id='language.advanced_captions_settings' />
</a>
</div>
}
</SmartContainer>
}
{ this.state.cvaaOverlay ? (
Expand All @@ -264,7 +213,9 @@ class LanguageControl extends BaseComponent {
* @memberof LanguageControl
*/
render(props: any): React$Element<any> | void {
var audioOptions = props.audioTracks.map(t => ({ label: t.label || t.language, active: t.active, value: t }));
var audioOptions = props.audioTracks
.filter(t => t.label || t.language)
.map(t => ({ label: t.label || t.language, active: t.active, value: t }));
var textOptions = props.textTracks.filter(t => t.kind === 'subtitles').map(t => ({ label: t.label || t.language, active: t.active, value: t }));

if (textOptions.length > 0) {
Expand All @@ -275,15 +226,9 @@ class LanguageControl extends BaseComponent {
})
}

if (audioOptions.length > 0 && textOptions.length > 0) {
if (audioOptions.length > 0 || textOptions.length > 0) {
return this.renderAll(audioOptions, textOptions);
}
else if (audioOptions.length > 0 && textOptions.length === 0) {
return this.renderAudioSettingsOnly(audioOptions);
}
else if (audioOptions.length === 0 && textOptions.length > 0) {
return this.renderTextSettingsOnly(textOptions);
}
else {
return undefined;
}
Expand Down
19 changes: 12 additions & 7 deletions src/components/settings/settings.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,6 +175,9 @@ class SettingsControl extends BaseComponent {
}, []);

let qualityOptions = props.videoTracks
.filter(t => {
return t.bandwidth || t.height
})
.sort((a, b) => {
return a.bandwidth < b.bandwidth
})
Expand All @@ -184,12 +187,14 @@ class SettingsControl extends BaseComponent {
value: t
}));

qualityOptions
.unshift({
label: 'Auto',
active: this.player.isAdaptiveBitrateEnabled(),
value: 'auto'
});
if (qualityOptions.length > 1) {
qualityOptions
.unshift({
label: 'Auto',
active: this.player.isAdaptiveBitrateEnabled(),
value: 'auto'
});
}

return (
<div
Expand All @@ -208,7 +213,7 @@ class SettingsControl extends BaseComponent {
{ !this.state.smartContainerOpen ? '' :
<SmartContainer title='Settings' onClose={() => this.onControlButtonClick()}>
{
props.videoTracks.length <= 0 ? '' :
qualityOptions.length === 0 ? '' :
<Localizer>
<SmartContainerItem icon='quality' label={<Text id='settings.quality' />} options={qualityOptions} onSelect={(o) => this.onQualityChange(o)} />
</Localizer>
Expand Down