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

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

Fix MemberAvatar PropTypes & MemberEventListSummary key
pull/21833/head
Richard van der Hoff 2016-11-11 14:00:02 +00:00 committed by GitHub
parent 23e764604c 5109833c42
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( ret.push(
<MemberEventListSummary events={summarisedEvents}> <MemberEventListSummary key={mxEv.getId()} events={summarisedEvents}>
{eventTiles} {eventTiles}
</MemberEventListSummary> </MemberEventListSummary>
); );

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

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