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

Initial context menu positioning and style change

pull/21833/head
wmwragg 2016-08-16 11:59:26 +01:00
parent 6fd61f5816
commit c359358101
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/components/views/rooms/EventTile.js
View File

@ -320,7 +320,6 @@ module.exports = React.createClass({
left -= 15; left -= 15;
} }
} }
var editButton;
var remText; var remText;
if (!this.state.allReadAvatars) { if (!this.state.allReadAvatars) {
var remainder = receipts.length - MAX_READ_AVATARS; var remainder = receipts.length - MAX_READ_AVATARS;
@ -331,15 +330,9 @@ module.exports = React.createClass({
</span>; </span>;
left -= 15; left -= 15;
} }
editButton = (
<input style={{ left: left }}
type="image" src="img/edit.png" alt="Options" title="Options" width="14" height="14"
className="mx_EventTile_editButton" onClick={this.onEditClicked} />
);
} }
return <span className="mx_EventTile_readAvatars"> return <span className="mx_EventTile_readAvatars">
{ editButton }
{ remText } { remText }
{ avatars } { avatars }
</span>; </span>;
@ -417,6 +410,11 @@ module.exports = React.createClass({
sender = <SenderProfile onClick={ this.onSenderProfileClick } mxEvent={this.props.mxEvent} aux={aux} />; sender = <SenderProfile onClick={ this.onSenderProfileClick } mxEvent={this.props.mxEvent} aux={aux} />;
} }
} }
var editButton = (
<input type="image" src="img/icon_context_message.svg" alt="Options" title="Options" width="19" height="19" className="mx_EventTile_editButton" onClick={this.onEditClicked} />
);
return ( return (
<div className={classes}> <div className={classes}>
<div className="mx_EventTile_msgOption"> <div className="mx_EventTile_msgOption">
@ -432,6 +430,7 @@ module.exports = React.createClass({
highlightLink={this.props.highlightLink} highlightLink={this.props.highlightLink}
showUrlPreview={this.props.showUrlPreview} showUrlPreview={this.props.showUrlPreview}
onWidgetLoad={this.props.onWidgetLoad} /> onWidgetLoad={this.props.onWidgetLoad} />
{ editButton }
</div> </div>
</div> </div>
); );