PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

Return null if TagOrderStore is loading

Browse source 
The view should decide the default state.
This commit is contained in:
Luke Barnard 2017-12-11 17:19:29 +00:00
parent 991ea4ebe5
commit aa914098dc
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/components/structures/TagPanel.js
View file

@ -58,7 +58,7 @@ const TagPanel = React.createClass({
return; return;
} }
const orderedTags = TagOrderStore.getOrderedTags(); const orderedTags = TagOrderStore.getOrderedTags() || [];
const orderedGroupTags = orderedTags.filter((t) => t[0] === '+'); const orderedGroupTags = orderedTags.filter((t) => t[0] === '+');
Promise.all(orderedGroupTags.map( Promise.all(orderedGroupTags.map(
(groupId) => FlairStore.getGroupProfileCached(this.context.matrixClient, groupId), (groupId) => FlairStore.getGroupProfileCached(this.context.matrixClient, groupId),

2
src/stores/TagOrderStore.js
View file

@ -94,7 +94,7 @@ class TagOrderStore extends Store {
_updateOrderedTags() { _updateOrderedTags() {
this._setState({ this._setState({
orderedTags: this._state.hasSynced && this._state.hasFetchedJoinedGroups ? orderedTags: this._state.hasSynced && this._state.hasFetchedJoinedGroups ?
this._state.orderedTagsAccountData || this._state.joinedGroupIds : [], this._state.orderedTagsAccountData || this._state.joinedGroupIds : null,
}); });
} }