matrix/matrix-react-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-react-sdk.git synced 2025-11-08 21:42:24 +03:00
Code Activity

Merge branch 'develop' into t3chguy/fix_forwarding

Browse Source
This commit is contained in:
Matthew Hodgson
2017-06-19 01:53:35 +01:00
committed by GitHub
parent 7b4cd31124 fac98d16dd
commit 032650e095
16 changed files with 649 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/stores/RoomViewStore.js
View File

@@ -137,6 +137,8 @@ class RoomViewStore extends Store {
forwardingEvent: null,
roomLoading: false,
roomLoadError: null,
// should peek by default
shouldPeek: payload.should_peek === undefined ? true : payload.should_peek,
};
// If an event ID wasn't specified, default to the one saved for this room
@@ -297,6 +299,10 @@ class RoomViewStore extends Store {
getForwardingEvent() {
return this._state.forwardingEvent;
}
shouldPeek() {
return this._state.shouldPeek;
}
}
let singletonRoomViewStore = null;