From 8d0c4e68b6bb4bd6ba908dc97b4ad73f163ef653 Mon Sep 17 00:00:00 2001 From: Eric Eastwood Date: Thu, 10 Feb 2022 01:45:10 -0600 Subject: [PATCH] Some changes to support RoomView with no composer --- src/domain/session/room/RoomViewModel.js | 1 - src/lib.ts | 2 ++ src/platform/web/ui/session/room/RoomView.js | 3 ++- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/domain/session/room/RoomViewModel.js b/src/domain/session/room/RoomViewModel.js index 354eba19..45799f39 100644 --- a/src/domain/session/room/RoomViewModel.js +++ b/src/domain/session/room/RoomViewModel.js @@ -21,7 +21,6 @@ import {avatarInitials, getIdentifierColorNumber, getAvatarHttpUrl} from "../../ import {tilesCreator} from "./timeline/tilesCreator.js"; import {ViewModel} from "../../ViewModel.js"; -console.log('RoomViewModel asdfwafeawfefewfewaeafwafewefw'); export class RoomViewModel extends ViewModel { constructor(options) { super(options); diff --git a/src/lib.ts b/src/lib.ts index c9de5516..b776fce8 100644 --- a/src/lib.ts +++ b/src/lib.ts @@ -19,11 +19,13 @@ export {Client, LoadStatus} from "./matrix/Client.js"; // export main view & view models export {createNavigation, createRouter} from "./domain/navigation/index.js"; export {RootViewModel} from "./domain/RootViewModel.js"; +export {TemplateView} from "./platform/web/ui/general/TemplateView"; export {RootView} from "./platform/web/ui/RootView.js"; export {SessionViewModel} from "./domain/session/SessionViewModel.js"; export {SessionView} from "./platform/web/ui/session/SessionView.js"; export {RoomViewModel} from "./domain/session/room/RoomViewModel.js"; export {RoomView} from "./platform/web/ui/session/room/RoomView.js"; +export {RightPanelView} from "./platform/web/ui/session/rightpanel/RightPanelView.js"; export {MediaRepository} from "./matrix/net/MediaRepository"; export {TilesCollection} from "./domain/session/room/timeline/TilesCollection.js"; export {tilesCreator} from "./domain/session/room/timeline/tilesCreator.js"; diff --git a/src/platform/web/ui/session/room/RoomView.js b/src/platform/web/ui/session/room/RoomView.js index c172766a..55fbd4f4 100644 --- a/src/platform/web/ui/session/room/RoomView.js +++ b/src/platform/web/ui/session/room/RoomView.js @@ -15,6 +15,7 @@ See the License for the specific language governing permissions and limitations under the License. */ +import { text } from "../../general/html"; import {TemplateView} from "../../general/TemplateView"; import {Popup} from "../../general/Popup.js"; import {Menu} from "../../general/Menu.js"; @@ -57,7 +58,7 @@ export class RoomView extends TemplateView { new TimelineView(timelineViewModel) : new TimelineLoadingView(vm); // vm is just needed for i18n }), - t.view(bottomView), + bottomView ? t.view(bottomView) : text(''), ]) ]); }