mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web synced 2024-10-26 04:35:55 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #547 from matrix-org/luke/fix-memberavatar-proptypes

Browse source 
Fix MemberAvatar PropTypes & MemberEventListSummary key
This commit is contained in:
Richard van der Hoff 2016-11-11 14:00:02 +00:00 committed by GitHub
commit b7fce70ce5
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/components/structures/MessagePanel.js
View file

@ -321,7 +321,7 @@ module.exports = React.createClass({
}
ret.push(
<MemberEventListSummary events={summarisedEvents}>
<MemberEventListSummary key={mxEv.getId()} events={summarisedEvents}>
{eventTiles}
</MemberEventListSummary>
);

4
src/components/views/avatars/MemberAvatar.js
View file

@ -30,9 +30,9 @@ module.exports = React.createClass({
height: React.PropTypes.number,
resizeMethod: React.PropTypes.string,
// The onClick to give the avatar
onClick: React.PropTypes.function,
onClick: React.PropTypes.func,
// Whether the onClick of the avatar should be overriden to dispatch 'view_user'
viewUserOnClick: React.PropTypes.boolean,
viewUserOnClick: React.PropTypes.bool,
},
getDefaultProps: function() {