From 17c4839029166fdf839dad273ff3adc2cc201c47 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Thu, 11 Jan 2018 19:21:02 +0000 Subject: [PATCH 1/2] only show reply button on REAL (not pending) m.room.message events Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- .../views/context_menus/MessageContextMenu.js | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/components/views/context_menus/MessageContextMenu.js b/src/components/views/context_menus/MessageContextMenu.js index 62bffa762..ab30c342d 100644 --- a/src/components/views/context_menus/MessageContextMenu.js +++ b/src/components/views/context_menus/MessageContextMenu.js @@ -232,6 +232,14 @@ module.exports = React.createClass({ ); + if (SettingsStore.isFeatureEnabled("feature_rich_quoting")) { + replyButton = ( +
+ { _t('Reply') } +
+ ); + } + if (this.state.canPin) { pinButton = (
@@ -280,14 +288,6 @@ module.exports = React.createClass({ { _t('Quote') }
); - - if (SettingsStore.isFeatureEnabled("feature_rich_quoting")) { - replyButton = ( -
- { _t('Reply') } -
- ); - } } // Bridges can provide a 'external_url' to link back to the source. From 5aec6840bf804cfa26daf4dce7fe4ad9403c900c Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Thu, 11 Jan 2018 19:33:21 +0000 Subject: [PATCH 2/2] Add cursor:pointer so that it actually looks clickable Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- .../vector/css/matrix-react-sdk/views/rooms/_QuotePreview.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/src/skins/vector/css/matrix-react-sdk/views/rooms/_QuotePreview.scss b/src/skins/vector/css/matrix-react-sdk/views/rooms/_QuotePreview.scss index f0fb62b8e..86fd79d47 100644 --- a/src/skins/vector/css/matrix-react-sdk/views/rooms/_QuotePreview.scss +++ b/src/skins/vector/css/matrix-react-sdk/views/rooms/_QuotePreview.scss @@ -28,6 +28,7 @@ .mx_QuotePreview_cancel { float: right; + cursor: pointer; } .mx_QuotePreview_clear {