mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web synced 2024-11-24 10:15:43 +03:00
Code Issues Projects Releases Packages Wiki Activity

MemberInfo: remove spinner if device query fails

Browse source 
If the request to /keys/query fails (for example, because we are a guest), we
need to remove the spinner.
This commit is contained in:
Richard van der Hoff 2016-06-08 22:54:48 +01:00
parent ef764c112e
commit 2352661513
1 changed files with 15 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/components/views/rooms/MemberInfo.js
View file

@ -56,7 +56,8 @@ module.exports = React.createClass({
muted: false,
isTargetMod: false,
updating: 0,
devices: null, // null means device list is loading
devicesLoading: true,
devices: null,
}
},
@ -97,6 +98,7 @@ module.exports = React.createClass({
_updateStateForNewMember: function(member) {
var newState = this._calculateOpsPermissions(member);
newState.devicesLoading = true;
newState.devices = null;
this.setState(newState);
@ -114,14 +116,18 @@ module.exports = React.createClass({
var client = MatrixClientPeg.get();
var self = this;
client.downloadKeys([member.userId], true).done(function() {
client.downloadKeys([member.userId], true).finally(function() {
self._cancelDeviceList = null;
}).done(function() {
if (cancelled) {
// we got cancelled - presumably a different user now
return;
}
self._cancelDeviceList = null;
var devices = client.listDeviceKeys(member.userId);
self.setState({devices: devices});
self.setState({devicesLoading: false, devices: devices});
}, function(err) {
console.log("Error downloading devices", err);
self.setState({devicesLoading: false});
});
},
@ -540,9 +546,13 @@ module.exports = React.createClass({
var Spinner = sdk.getComponent("elements.Spinner");
var devComponents;
if (devices === null) {
if (this.state.devicesLoading) {
// still loading
devComponents = <Spinner />;
} else if (devices === null) {
devComponents = "Unable to load device list";
} else if (devices.length === 0) {
devComponents = "No registered devices";
} else {
devComponents = [];
for (var i = 0; i < devices.length; i++) {