BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added requested changes to fullscreen button fix

Browse Source
This commit is contained in:
Bobak Oftadeh 2018-05-08 09:04:15 -07:00
parent 1c28ec9d9a
commit 9071b8086d
1 changed files with 37 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
bigbluebutton-html5/imports/ui/components/nav-bar/settings-dropdown/component.jsx
View File

@ -70,8 +70,7 @@ class SettingsDropdown extends Component {
super(props);
this.state = {
isSettingOpen: false,
isFullScreen: false,
isSettingOpen: false
};
this.onActionsShow = this.onActionsShow.bind(this);
@ -84,10 +83,10 @@ class SettingsDropdown extends Component {
}
componentWillReceiveProps(nextProps) {
this.setState(
{ isFullScreen: nextProps.isFullScreen },
() => this.createMenu(),
);
const iOS = /iPad|iPhone|iPod/.test(navigator.userAgent);
if (this.props.isFullScreen !== nextProps.isFullScreen && !iOS) {
this.alterMenu(nextProps.isFullScreen);
}
}
onActionsShow() {
@ -113,27 +112,12 @@ class SettingsDropdown extends Component {
createMenu() {
const { intl, mountModal } = this.props;
let fullscreenLabel;
let fullscreenDesc;
let fullscreenIcon;
if (this.state.isFullScreen) {
fullscreenLabel = intl.formatMessage(intlMessages.exitFullscreenLabel);
fullscreenDesc = intl.formatMessage(intlMessages.exitFullscreenDesc);
fullscreenIcon = 'exit_fullscreen';
} else {
fullscreenLabel = intl.formatMessage(intlMessages.fullscreenLabel);
fullscreenDesc = intl.formatMessage(intlMessages.fullscreenDesc);
fullscreenIcon = 'fullscreen';
}
this.menuItems = [
(<DropdownListItem
key={_.uniqueId('list-item-')}
icon={fullscreenIcon}
label={fullscreenLabel}
description={fullscreenDesc}
icon='fullscreen'
label={intl.formatMessage(intlMessages.fullscreenLabel)}
description={intl.formatMessage(intlMessages.fullscreenDesc)}
onClick={this.props.handleToggleFullscreen}
/>),
(<DropdownListItem
@ -160,6 +144,35 @@ class SettingsDropdown extends Component {
/>),
];
}
alterMenu(fullScreenTrue){
const { intl } = this.props;
let fullscreenLabel;
let fullscreenDesc;
let fullscreenIcon;
if (fullScreenTrue) {
fullscreenLabel = intl.formatMessage(intlMessages.exitFullscreenLabel);
fullscreenDesc = intl.formatMessage(intlMessages.exitFullscreenDesc);
fullscreenIcon = 'exit_fullscreen';
} else {
fullscreenLabel = intl.formatMessage(intlMessages.fullscreenLabel);
fullscreenDesc = intl.formatMessage(intlMessages.fullscreenDesc);
fullscreenIcon = 'fullscreen';
}
let newFullScreenButton = (<DropdownListItem
key={_.uniqueId('list-item-')}
icon={fullscreenIcon}
label={fullscreenLabel}
description={fullscreenDesc}
onClick={this.props.handleToggleFullscreen}
/>)
const result = this.menuItems.slice(1)
result.unshift(newFullScreenButton)
this.menuItems = result
}
render() {
const { intl } = this.props;