ehealthsolutions/healthchat-web
3
0
Fork 0
mirror of https://github.com/Novaloop-AG/healthchat-web.git synced 2026-11-07 15:08:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'vector' of github.com:matrix-org/matrix-react-sdk into erikj/room_editing

Browse Source
This commit is contained in:
Erik Johnston
2015-07-20 16:31:02 +01:00
parent eae0972820 6fe842e130
commit 1b6ca2b0ee
21 changed files with 195 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
skins/base/views/molecules/MemberInfo.js
+11
View File
@@ -25,6 +25,16 @@ module.exports = React.createClass({
displayName: 'MemberInfo',
mixins: [MemberInfoController],
componentDidMount: function() {
var self = this;
var memberInfo = this.getDOMNode();
var memberListScroll = document.getElementsByClassName("mx_MemberList_border")[0];
if (memberListScroll) {
memberInfo.style.top = (memberInfo.parentElement.offsetTop - memberListScroll.scrollTop) + "px";
}
},
getDuration: function(time) {
if (!time) return;
var t = parseInt(time / 1000);
@@ -61,6 +71,7 @@ module.exports = React.createClass({
return (
<div className="mx_MemberInfo">
<img className="mx_MemberInfo_chevron" src="img/chevron-right.png" width="9" height="16" />
<div className="mx_MemberInfo_shim"></div>
<div className="mx_MemberInfo_avatar">
<img className="mx_MemberInfo_avatarImg"
src={ this.props.member ? MatrixClientPeg.get().getAvatarUrlForMember(this.props.member, 128, 128, "crop") : null }