imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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
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;