[CONFLICT CHUNKS] Merge branch 'develop' into travis/sourcemaps-develop

2020-01-09 14:15:09 -07:00 · 2020-01-09 14:15:09 -07:00 · fde32f13a5
commit fde32f13a5
parent 6ca9a7c998 d40091afc5
190 changed files with 6185 additions and 2225 deletions
--- a/src/components/views/context_menus/MessageContextMenu.js
+++ b/src/components/views/context_menus/MessageContextMenu.js
@ -422,7 +422,7 @@ export default createReactClass({
            </MenuItem>
        );

-        if (this.props.eventTileOps && this.props.eventTileOps.getInnerText) {
+        if (this.props.eventTileOps) { // this event is rendered using TextualBody
            quoteButton = (
                <MenuItem className="mx_MessageContextMenu_field" onClick={this.onQuoteClick}>
                    { _t('Quote') }