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

Make ChangeAvatar support room avatars and tweak RoomAvatar respond to componentWillReceiveProps

Browse source
This commit is contained in:
David Baker 2015-10-23 17:34:11 +01:00
parent 03dfd57a79
commit 5a760b71d0
3 changed files with 31 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/controllers/molecules/ChangeAvatar.js
View file

@ -19,7 +19,8 @@ var MatrixClientPeg = require("../../MatrixClientPeg");
module.exports = {
propTypes: {
initialAvatarUrl: React.PropTypes.string.isRequired,
initialAvatarUrl: React.PropTypes.string,
room: React.PropTypes.object,
},
Phases: {
@ -44,7 +45,16 @@ module.exports = {
var self = this;
MatrixClientPeg.get().uploadContent(file).then(function(url) {
newUrl = url;
return MatrixClientPeg.get().setAvatarUrl(url);
if (self.props.room) {
return MatrixClientPeg.get().sendStateEvent(
self.props.room.roomId,
'm.room.avatar',
{url: url},
''
);
} else {
return MatrixClientPeg.get().setAvatarUrl(url);
}
}).done(function() {
self.setState({
phase: self.Phases.Display,
@ -52,7 +62,7 @@ module.exports = {
});
}, function(error) {
self.setState({
phase: this.Phases.Error
phase: self.Phases.Error
});
self.onError(error);
});