matrix/matrix-react-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-react-sdk.git synced 2025-11-11 20:22:36 +03:00
Code Activity

Use MemberAvatar to generate image JSX. Split out entries from tab-complete logic

Browse Source
This commit is contained in:
Kegan Dougal
2015-12-22 10:00:30 +00:00
parent 618978d955
commit 0dbb8d5294
4 changed files with 73 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/components/views/rooms/MessageComposer.js
View File

@@ -31,7 +31,7 @@ var MatrixClientPeg = require("../../../MatrixClientPeg");
var SlashCommands = require("../../../SlashCommands");
var Modal = require("../../../Modal");
var CallHandler = require('../../../CallHandler');
var TabComplete = require("../../../TabComplete");
var MemberEntry = require("../../../TabCompleteEntries").MemberEntry;
var sdk = require('../../../index');
var dis = require("../../../dispatcher");
@@ -229,15 +229,7 @@ module.exports = React.createClass({
}
}
}).map(function(m) {
var url = m.getAvatarUrl(
MatrixClientPeg.get().getHomeserverUrl(), 32, 32, "crop"
);
return new TabComplete.Entry(
m.name || m.userId,
// TODO: annoying that the JS SDK can return 0-len strings when
// it should be returning null.. can't use truthy constructs!
url && url.length > 0 ? url : null
);
return new MemberEntry(m);
});
}
if (this.props.tabComplete) {