diff options
author | Chris <ccbrown112@gmail.com> | 2017-06-23 15:47:24 -0700 |
---|---|---|
committer | Corey Hulen <corey@hulen.com> | 2017-06-23 15:47:24 -0700 |
commit | 4df36a504cebc61fa1e5e6f7980f9245b475facf (patch) | |
tree | f6d6d8a6093dc7934cbd0b84be950d1595d9395e /webapp/components/sidebar_header_dropdown.jsx | |
parent | bf12e7e32cef427edacbd512d067c2bfd35d3b67 (diff) | |
download | chat-4df36a504cebc61fa1e5e6f7980f9245b475facf.tar.gz chat-4df36a504cebc61fa1e5e6f7980f9245b475facf.tar.bz2 chat-4df36a504cebc61fa1e5e6f7980f9245b475facf.zip |
PLT-6714: add /settings command (#6716)
* add /settings command
* update receiver name
Diffstat (limited to 'webapp/components/sidebar_header_dropdown.jsx')
-rw-r--r-- | webapp/components/sidebar_header_dropdown.jsx | 28 |
1 files changed, 6 insertions, 22 deletions
diff --git a/webapp/components/sidebar_header_dropdown.jsx b/webapp/components/sidebar_header_dropdown.jsx index 5a7784733..54f8c3a2d 100644 --- a/webapp/components/sidebar_header_dropdown.jsx +++ b/webapp/components/sidebar_header_dropdown.jsx @@ -13,7 +13,6 @@ import WebrtcStore from 'stores/webrtc_store.jsx'; import AboutBuildModal from './about_build_modal.jsx'; import SidebarHeaderDropdownButton from './sidebar_header_dropdown_button.jsx'; import TeamMembersModal from './team_members_modal.jsx'; -import UserSettingsModal from './user_settings/user_settings_modal.jsx'; import AddUsersToTeam from 'components/add_users_to_team'; import {Constants, WebrtcActionTypes} from 'utils/constants.jsx'; @@ -45,7 +44,7 @@ export default class SidebarHeaderDropdown extends React.Component { this.handleAboutModal = this.handleAboutModal.bind(this); this.aboutModalDismissed = this.aboutModalDismissed.bind(this); - this.toggleAccountSettingsModal = this.toggleAccountSettingsModal.bind(this); + this.showAccountSettingsModal = this.showAccountSettingsModal.bind(this); this.showAddUsersToTeamModal = this.showAddUsersToTeamModal.bind(this); this.hideAddUsersToTeamModal = this.hideAddUsersToTeamModal.bind(this); this.showInviteMemberModal = this.showInviteMemberModal.bind(this); @@ -54,7 +53,6 @@ export default class SidebarHeaderDropdown extends React.Component { this.hideTeamMembersModal = this.hideTeamMembersModal.bind(this); this.onTeamChange = this.onTeamChange.bind(this); - this.openAccountSettings = this.openAccountSettings.bind(this); this.renderCustomEmojiLink = this.renderCustomEmojiLink.bind(this); @@ -66,7 +64,6 @@ export default class SidebarHeaderDropdown extends React.Component { showAboutModal: false, showDropdown: false, showTeamMembersModal: false, - showUserSettingsModal: false, showAddUsersToTeamModal: false }; } @@ -104,13 +101,12 @@ export default class SidebarHeaderDropdown extends React.Component { this.setState({showAboutModal: false}); } - toggleAccountSettingsModal(e) { + showAccountSettingsModal(e) { e.preventDefault(); - this.setState({ - showUserSettingsModal: !this.state.showUserSettingsModal, - showDropdown: false - }); + this.setState({showDropdown: false}); + + GlobalActions.showAccountSettingsModal(); } showAddUsersToTeamModal(e) { @@ -160,7 +156,6 @@ export default class SidebarHeaderDropdown extends React.Component { componentDidMount() { TeamStore.addChangeListener(this.onTeamChange); - document.addEventListener('keydown', this.openAccountSettings); } onTeamChange() { @@ -174,13 +169,6 @@ export default class SidebarHeaderDropdown extends React.Component { componentWillUnmount() { $(ReactDOM.findDOMNode(this.refs.dropdown)).off('hide.bs.dropdown'); TeamStore.removeChangeListener(this.onTeamChange); - document.removeEventListener('keydown', this.openAccountSettings); - } - - openAccountSettings(e) { - if (Utils.cmdOrCtrlPressed(e) && e.shiftKey && e.keyCode === Constants.KeyCodes.A) { - this.toggleAccountSettingsModal(e); - } } renderCustomEmojiLink() { @@ -527,7 +515,7 @@ export default class SidebarHeaderDropdown extends React.Component { <a id='accountSettings' href='#' - onClick={this.toggleAccountSettingsModal} + onClick={this.showAccountSettingsModal} > <FormattedMessage id='navbar_dropdown.accountSettings' @@ -634,10 +622,6 @@ export default class SidebarHeaderDropdown extends React.Component { {about} {logoutDivider} {logout} - <UserSettingsModal - show={this.state.showUserSettingsModal} - onModalDismissed={() => this.setState({showUserSettingsModal: false})} - /> {teamMembersModal} <AboutBuildModal show={this.state.showAboutModal} |