diff options
-rw-r--r-- | webapp/actions/global_actions.jsx | 17 | ||||
-rw-r--r-- | webapp/components/leave_team_modal.jsx | 1 | ||||
-rw-r--r-- | webapp/components/sidebar_right_menu.jsx | 17 |
3 files changed, 19 insertions, 16 deletions
diff --git a/webapp/actions/global_actions.jsx b/webapp/actions/global_actions.jsx index 33a1c8432..6bdd7c4b4 100644 --- a/webapp/actions/global_actions.jsx +++ b/webapp/actions/global_actions.jsx @@ -497,6 +497,23 @@ export function toggleSideBarAction(visible) { } } +export function toggleSideBarRightMenuAction() { + AppDispatcher.handleServerAction({ + type: ActionTypes.RECEIVED_SEARCH, + results: null + }); + + AppDispatcher.handleServerAction({ + type: ActionTypes.RECEIVED_POST_SELECTED, + postId: null + }); + + document.querySelector('.app__body .inner-wrap').classList.remove('move--right', 'move--left', 'move--left-small'); + document.querySelector('.app__body .sidebar--left').classList.remove('move--right'); + document.querySelector('.app__body .sidebar--right').classList.remove('move--left'); + document.querySelector('.app__body .sidebar--menu').classList.remove('move--left'); +} + export function emitBrowserFocus(focus) { AppDispatcher.handleViewAction({ type: ActionTypes.BROWSER_CHANGE_FOCUS, diff --git a/webapp/components/leave_team_modal.jsx b/webapp/components/leave_team_modal.jsx index 379ece4c3..a38dd2da1 100644 --- a/webapp/components/leave_team_modal.jsx +++ b/webapp/components/leave_team_modal.jsx @@ -61,6 +61,7 @@ class LeaveTeamModal extends React.Component { } GlobalActions.emitLeaveTeam(); + GlobalActions.toggleSideBarRightMenuAction(); } handleHide() { diff --git a/webapp/components/sidebar_right_menu.jsx b/webapp/components/sidebar_right_menu.jsx index d40e90279..f0e6f10a1 100644 --- a/webapp/components/sidebar_right_menu.jsx +++ b/webapp/components/sidebar_right_menu.jsx @@ -1,7 +1,6 @@ // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved. // See License.txt for license information. -import AppDispatcher from 'dispatcher/app_dispatcher.jsx'; import TeamMembersModal from './team_members_modal.jsx'; import ToggleModalButton from './toggle_modal_button.jsx'; import AboutBuildModal from './about_build_modal.jsx'; @@ -19,7 +18,6 @@ import * as UserAgent from 'utils/user_agent.jsx'; import * as Utils from 'utils/utils.jsx'; import {Constants, WebrtcActionTypes} from 'utils/constants.jsx'; -const ActionTypes = Constants.ActionTypes; const Preferences = Constants.Preferences; const TutorialSteps = Constants.TutorialSteps; @@ -143,20 +141,7 @@ export default class SidebarRightMenu extends React.Component { hideSidebars() { if (Utils.isMobile()) { - AppDispatcher.handleServerAction({ - type: ActionTypes.RECEIVED_SEARCH, - results: null - }); - - AppDispatcher.handleServerAction({ - type: ActionTypes.RECEIVED_POST_SELECTED, - postId: null - }); - - document.querySelector('.app__body .inner-wrap').classList.remove('move--right', 'move--left', 'move--left-small'); - document.querySelector('.app__body .sidebar--left').classList.remove('move--right'); - document.querySelector('.app__body .sidebar--right').classList.remove('move--left'); - document.querySelector('.app__body .sidebar--menu').classList.remove('move--left'); + GlobalActions.toggleSideBarRightMenuAction(); } } |