OpenCloud
/
element-web
mirror of https://github.com/vector-im/element-web
1
0
Fork 0
Code Issues Releases Wiki Activity

pass the correct phase params for consistency 

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
pull/21833/head
Michael Telatynski 2020-01-09 15:51:19 +00:00
parent 7dfc392a2b
commit 0a9d7f43c6
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/components/views/right_panel/GroupHeaderButtons.js
View File

@ -23,6 +23,7 @@ import { _t } from '../../../languageHandler';
import HeaderButton from './HeaderButton'; import HeaderButton from './HeaderButton';
import HeaderButtons, {HEADER_KIND_GROUP} from './HeaderButtons'; import HeaderButtons, {HEADER_KIND_GROUP} from './HeaderButtons';
import {RIGHT_PANEL_PHASES} from "../../../stores/RightPanelStorePhases"; import {RIGHT_PANEL_PHASES} from "../../../stores/RightPanelStorePhases";
import RightPanelStore from "../../../stores/RightPanelStore";
const GROUP_PHASES = [ const GROUP_PHASES = [
RIGHT_PANEL_PHASES.GroupMemberInfo, RIGHT_PANEL_PHASES.GroupMemberInfo,
@ -68,7 +69,7 @@ export default class GroupHeaderButtons extends HeaderButtons {
_onMembersClicked() { _onMembersClicked() {
if (this.state.phase === RIGHT_PANEL_PHASES.GroupMemberInfo) { if (this.state.phase === RIGHT_PANEL_PHASES.GroupMemberInfo) {
// send the active phase to trigger a toggle // send the active phase to trigger a toggle
this.setPhase(RIGHT_PANEL_PHASES.GroupMemberInfo); this.setPhase(RIGHT_PANEL_PHASES.GroupMemberInfo, RightPanelStore.getSharedInstance().roomPanelPhaseParams);
} else { } else {
// This toggles for us, if needed // This toggles for us, if needed
this.setPhase(RIGHT_PANEL_PHASES.GroupMemberList); this.setPhase(RIGHT_PANEL_PHASES.GroupMemberList);

3
src/components/views/right_panel/RoomHeaderButtons.js
View File

@ -23,6 +23,7 @@ import { _t } from '../../../languageHandler';
import HeaderButton from './HeaderButton'; import HeaderButton from './HeaderButton';
import HeaderButtons, {HEADER_KIND_ROOM} from './HeaderButtons'; import HeaderButtons, {HEADER_KIND_ROOM} from './HeaderButtons';
import {RIGHT_PANEL_PHASES} from "../../../stores/RightPanelStorePhases"; import {RIGHT_PANEL_PHASES} from "../../../stores/RightPanelStorePhases";
import RightPanelStore from "../../../stores/RightPanelStore";
const MEMBER_PHASES = [ const MEMBER_PHASES = [
RIGHT_PANEL_PHASES.RoomMemberList, RIGHT_PANEL_PHASES.RoomMemberList,
@ -58,7 +59,7 @@ export default class RoomHeaderButtons extends HeaderButtons {
_onMembersClicked() { _onMembersClicked() {
if (this.state.phase === RIGHT_PANEL_PHASES.RoomMemberInfo) { if (this.state.phase === RIGHT_PANEL_PHASES.RoomMemberInfo) {
// send the active phase to trigger a toggle // send the active phase to trigger a toggle
this.setPhase(RIGHT_PANEL_PHASES.RoomMemberInfo); this.setPhase(RIGHT_PANEL_PHASES.RoomMemberInfo, RightPanelStore.getSharedInstance().roomPanelPhaseParams);
} else { } else {
// This toggles for us, if needed // This toggles for us, if needed
this.setPhase(RIGHT_PANEL_PHASES.RoomMemberList); this.setPhase(RIGHT_PANEL_PHASES.RoomMemberList);