OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #109 from matrix-org/kegan/room-swap-perf 

Improve room swap performance
pull/21833/head
Kegsay 2016-01-22 14:08:20 +00:00
parent e72323c405 7ef1ba0b44
commit 4775f39e1d
2 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/components/views/avatars/RoomAvatar.js
View File

@ -67,14 +67,24 @@ module.exports = React.createClass({
},
getOneToOneAvatar: function(props) {
var userIds = Object.keys(props.room.currentState.members);
var mlist = props.room.currentState.members;
var userIds = [];
// for .. in optimisation to return early if there are >2 keys
for (var uid in mlist) {
if (mlist.hasOwnProperty(uid)) {
userIds.push(uid);
}
if (userIds.length > 2) {
return null;
}
}
if (userIds.length == 2) {
var theOtherGuy = null;
if (props.room.currentState.members[userIds[0]].userId == MatrixClientPeg.get().credentials.userId) {
theOtherGuy = props.room.currentState.members[userIds[1]];
if (mlist[userIds[0]].userId == MatrixClientPeg.get().credentials.userId) {
theOtherGuy = mlist[userIds[1]];
} else {
theOtherGuy = props.room.currentState.members[userIds[0]];
theOtherGuy = mlist[userIds[0]];
}
return theOtherGuy.getAvatarUrl(
MatrixClientPeg.get().getHomeserverUrl(),
@ -82,7 +92,7 @@ module.exports = React.createClass({
false
);
} else if (userIds.length == 1) {
return props.room.currentState.members[userIds[0]].getAvatarUrl(
return mlist[userIds[0]].getAvatarUrl(
MatrixClientPeg.get().getHomeserverUrl(),
props.width, props.height, props.resizeMethod,
false

8
src/components/views/rooms/RoomHeader.js
View File

@ -20,6 +20,7 @@ var React = require('react');
var sdk = require('../../../index');
var dis = require("../../../dispatcher");
var MatrixClientPeg = require('../../../MatrixClientPeg');
var Modal = require("../../../Modal");
var linkify = require('linkifyjs');
var linkifyElement = require('linkifyjs/element');
@ -103,17 +104,14 @@ module.exports = React.createClass({
console.error("No ChangeAvatar found to upload image to!");
return;
}
changeAvatar.onFileSelected(ev).done(function() {
// dunno if the avatar changed, re-check it.
self._refreshFromServer();
}, function(err) {
changeAvatar.onFileSelected(ev).catch(function(err) {
var errMsg = (typeof err === "string") ? err : (err.error || "");
var ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
Modal.createDialog(ErrorDialog, {
title: "Error",
description: "Failed to set avatar. " + errMsg
});
});
}).done();
},
getRoomName: function() {