From f3c7ab337d57b413f9334276e2607b3bf420b372 Mon Sep 17 00:00:00 2001 From: RMidhunSuresh Date: Thu, 17 Jun 2021 15:16:34 +0530 Subject: [PATCH] Remove code from session view/vm Signed-off-by: RMidhunSuresh --- src/domain/session/SessionViewModel.js | 23 +--------------------- src/platform/web/ui/session/SessionView.js | 3 --- 2 files changed, 1 insertion(+), 25 deletions(-) diff --git a/src/domain/session/SessionViewModel.js b/src/domain/session/SessionViewModel.js index 1a80aa82..a66d66a0 100644 --- a/src/domain/session/SessionViewModel.js +++ b/src/domain/session/SessionViewModel.js @@ -25,8 +25,7 @@ import {RoomGridViewModel} from "./RoomGridViewModel.js"; import {SettingsViewModel} from "./settings/SettingsViewModel.js"; import {ViewModel} from "../ViewModel.js"; import {RoomViewModelObservable} from "./RoomViewModelObservable.js"; -import {MemberListViewModel} from "./rightpanel/MemberListViewModel.js"; -import { RightPanelViewModel } from "./rightpanel/RightPanelViewModel.js"; +import {RightPanelViewModel} from "./rightpanel/RightPanelViewModel.js"; export class SessionViewModel extends ViewModel { constructor(options) { @@ -82,9 +81,6 @@ export class SessionViewModel extends ViewModel { })); this._updateLightbox(lightbox.get()); - // const members = this.navigation.observe("members"); - // this.track(members.subscribe(() => this._toggleMemberListPanel())); - // this._toggleMemberListPanel(); const rightpanel = this.navigation.observe("rightpanel"); this.track(rightpanel.subscribe(() => this._updateRightPanel())); @@ -123,9 +119,6 @@ export class SessionViewModel extends ViewModel { return this._roomViewModelObservable?.get(); } - get memberListViewModel() { - return this._memberListViewModel; - } get rightPanelViewModel() { return this._rightPanelViewModel; @@ -265,20 +258,6 @@ export class SessionViewModel extends ViewModel { return room; } - async _toggleMemberListPanel() { - this._memberListViewModel = this.disposeTracked(this._memberListViewModel); - const enable = !!this.navigation.path.get("members")?.value; - if (enable) { - const room = this._roomFromNavigation(); - const list = await room.loadMemberList(); - const members = list.members; - this._memberListViewModel = this.track( - new MemberListViewModel(this.childOptions({members})) - ); - } - this.emitChange("memberListViewModel"); - } - _updateRightPanel() { this._rightPanelViewModel = this.disposeTracked(this._rightPanelViewModel); const enable = !!this.navigation.path.get("rightpanel")?.value; diff --git a/src/platform/web/ui/session/SessionView.js b/src/platform/web/ui/session/SessionView.js index 15a5d0dd..0cda8428 100644 --- a/src/platform/web/ui/session/SessionView.js +++ b/src/platform/web/ui/session/SessionView.js @@ -25,8 +25,6 @@ import {StaticView} from "../general/StaticView.js"; import {SessionStatusView} from "./SessionStatusView.js"; import {RoomGridView} from "./RoomGridView.js"; import {SettingsView} from "./settings/SettingsView.js"; -import {RoomDetailsView} from "./rightpanel/RoomDetailsView.js"; -import {MemberListView} from "./rightpanel/MemberListView.js"; import {RightPanelView} from "./rightpanel/RightPanelView.js"; export class SessionView extends TemplateView { @@ -57,7 +55,6 @@ export class SessionView extends TemplateView { return new StaticView(t => t.div({className: "room-placeholder"}, t.h2(vm.i18n`Choose a room on the left side.`))); } }), - t.mapView(vm => vm.memberListViewModel, memberListViewModel => memberListViewModel ? new MemberListView(memberListViewModel) : null), t.mapView(vm => vm.lightboxViewModel, lightboxViewModel => lightboxViewModel ? new LightboxView(lightboxViewModel) : null), t.mapView(vm => vm.rightPanelViewModel, rightPanelViewModel => rightPanelViewModel ? new RightPanelView(rightPanelViewModel) : null) ]);