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

Introduce state peekLoading to avoid collision with roomLoading

Browse source 
The room loading spinner will now be displayed if the alias is being resolved (roomLoading) or if the peek is being loaded for the room `peekLoading`.
This commit is contained in:
Luke Barnard 2017-06-05 09:52:39 +01:00
parent 792f825ea9
commit 239874ccce
2 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/components/structures/RoomView.js
View file

@ -120,6 +120,7 @@ module.exports = React.createClass({
room: null, room: null,
roomId: null, roomId: null,
roomLoading: true, roomLoading: true,
peekLoading: false,
forwardingEvent: null, forwardingEvent: null,
editingRoomSettings: false, editingRoomSettings: false,
@ -222,10 +223,13 @@ module.exports = React.createClass({
} else if (this.state.roomId) { } else if (this.state.roomId) {
console.log("Attempting to peek into room %s", this.state.roomId); console.log("Attempting to peek into room %s", this.state.roomId);
this.setState({
peekLoading: true,
});
MatrixClientPeg.get().peekInRoom(this.state.roomId).then((room) => { MatrixClientPeg.get().peekInRoom(this.state.roomId).then((room) => {
this.setState({ this.setState({
room: room, room: room,
roomLoading: false, peekLoading: false,
}); });
this._onRoomLoaded(room); this._onRoomLoaded(room);
}, (err) => { }, (err) => {
@ -235,7 +239,7 @@ module.exports = React.createClass({
if (err.errcode == "M_GUEST_ACCESS_FORBIDDEN") { if (err.errcode == "M_GUEST_ACCESS_FORBIDDEN") {
// This is fine: the room just isn't peekable (we assume). // This is fine: the room just isn't peekable (we assume).
this.setState({ this.setState({
roomLoading: false, peekLoading: false,
}); });
} else { } else {
throw err; throw err;
@ -1422,7 +1426,7 @@ module.exports = React.createClass({
const TimelinePanel = sdk.getComponent("structures.TimelinePanel"); const TimelinePanel = sdk.getComponent("structures.TimelinePanel");
if (!this.state.room) { if (!this.state.room) {
if (this.state.roomLoading) { if (this.state.roomLoading || this.state.peekLoading) {
return ( return (
<div className="mx_RoomView"> <div className="mx_RoomView">
<Loader /> <Loader />

2
src/stores/LifecycleStore.js
View file

@ -41,7 +41,6 @@ class LifecycleStore extends Store {
__onDispatch(payload) { __onDispatch(payload) {
switch (payload.action) { switch (payload.action) {
case 'do_after_sync_prepared': case 'do_after_sync_prepared':
console.info('Will do after sync', payload.deferred_action);
this._setState({ this._setState({
deferred_action: payload.deferred_action, deferred_action: payload.deferred_action,
}); });
@ -50,7 +49,6 @@ class LifecycleStore extends Store {
if (payload.state !== 'PREPARED') { if (payload.state !== 'PREPARED') {
break; break;
} }
console.info('Doing', payload.deferred_action);
if (!this._state.deferred_action) break; if (!this._state.deferred_action) break;
const deferredAction = Object.assign({}, this._state.deferred_action); const deferredAction = Object.assign({}, this._state.deferred_action);
this._setState({ this._setState({