Matrix-Mirrors/schildi-web
1
0
Fork 0
mirror of https://github.com/SchildiChat/element-web.git synced 2024-09-22 00:55:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into develop

Browse Source
This commit is contained in:
Weblate 2017-08-10 09:35:49 +00:00
commit 81d123f652
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/components/views/context_menus/MessageContextMenu.js
View File

@ -134,10 +134,9 @@ module.exports = React.createClass({
}, },
onQuoteClick: function() { onQuoteClick: function() {
console.log(this.props.mxEvent);
dis.dispatch({ dis.dispatch({
action: 'quote', action: 'quote',
event: this.props.mxEvent, text: this.props.eventTileOps.getInnerText(),
}); });
this.closeMenu(); this.closeMenu();
}, },
@ -153,6 +152,7 @@ module.exports = React.createClass({
let unhidePreviewButton; let unhidePreviewButton;
let permalinkButton; let permalinkButton;
let externalURLButton; let externalURLButton;
let quoteButton;
if (eventStatus === 'not_sent') { if (eventStatus === 'not_sent') {
resendButton = ( resendButton = (
@ -221,11 +221,13 @@ module.exports = React.createClass({
</div> </div>
); );
const quoteButton = ( if (this.props.eventTileOps && this.props.eventTileOps.getInnerText) {
<div className="mx_MessageContextMenu_field" onClick={this.onQuoteClick}> quoteButton = (
{ _t('Quote') } <div className="mx_MessageContextMenu_field" onClick={this.onQuoteClick}>
</div> { _t('Quote') }
); </div>
);
}
// Bridges can provide a 'external_url' to link back to the source. // Bridges can provide a 'external_url' to link back to the source.
if( typeof(this.props.mxEvent.event.content.external_url) === "string") { if( typeof(this.props.mxEvent.event.content.external_url) === "string") {