mad-star-studio/element-web
2
0
Fork 0
Code Pull requests Activity

match the design

Browse source
This commit is contained in:
Matthew Hodgson 2015-08-14 21:14:05 +01:00
parent a2e7c4aa77
commit 80c3b2c8a3
5 changed files with 35 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

1
skins/base/views/atoms/EditableText.js
View file

@ -33,7 +33,6 @@ module.exports = React.createClass({
},
onClickDiv: function() {
console.log("onClickDiv triggered");
this.setState({
phase: this.Phases.Edit,
})

14
skins/base/views/molecules/MemberTile.js
View file

@ -70,8 +70,12 @@ module.exports = React.createClass({
},
getPrettyPresence: function(user) {
if (!user) return "Unknown";
var presence = user.presence;
return presence.charAt(0).toUpperCase() + presence.slice(1);
if (presence === "online") return "Online";
if (presence === "unavailable") return "Idle"; // XXX: is this actually right?
if (presence === "offline") return "Offline";
return "Unknown";
},
render: function() {
@ -110,7 +114,7 @@ module.exports = React.createClass({
if (this.state.hover) {
var presence;
// FIXME: make presence data update whenever User.presence changes...
var active = this.props.member.user.lastActiveAgo || -1;
var active = this.props.member.user ? (this.props.member.user.lastActiveAgo || -1) : -1;
if (active >= 0) {
presence = <div className="mx_MemberTile_presence">{ this.getPrettyPresence(this.props.member.user) } for { this.getDuration(active) }</div>;
}
@ -118,12 +122,12 @@ module.exports = React.createClass({
presence = <div className="mx_MemberTile_presence">{ this.getPrettyPresence(this.props.member.user) }</div>;
}
// <MemberInfo member={this.props.member} />
nameEl =
<div className="mx_MemberTile_details">
<MemberInfo member={this.props.member} />
<div className="mx_MemberTile_userId">{ this.props.member.userId }</div>
{ presence }
{ leave }
<div className="mx_MemberTile_userId" title={ this.props.member.userId }>{ this.props.member.userId }</div>
{ presence }
</div>
}
else {

7
skins/base/views/organisms/MemberList.js
View file

@ -75,14 +75,9 @@ module.exports = React.createClass({
},
inviteTile: function() {
// if (this.state.inviting) {
// return (
// <div></div>
// );
// }
var classes = classNames({
mx_MemberTile: true,
mx_MemberTile_inviteTile: true,
mx_MemberTile_inviteEditing: this.state.editing,
});