Merge pull request #2448 from aviraldg/fix-quote

Only show quote option if RTE is enabled
This commit is contained in:
Matthew Hodgson 2016-10-11 14:39:42 +01:00 committed by GitHub
commit 86cb3e9376
1 changed files with 3 additions and 2 deletions

View File

@ -20,9 +20,10 @@ var React = require('react');
var MatrixClientPeg = require('matrix-react-sdk/lib/MatrixClientPeg'); var MatrixClientPeg = require('matrix-react-sdk/lib/MatrixClientPeg');
var dis = require('matrix-react-sdk/lib/dispatcher'); var dis = require('matrix-react-sdk/lib/dispatcher');
var sdk = require('matrix-react-sdk') var sdk = require('matrix-react-sdk');
var Modal = require('matrix-react-sdk/lib/Modal'); var Modal = require('matrix-react-sdk/lib/Modal');
var Resend = require("matrix-react-sdk/lib/Resend"); var Resend = require("matrix-react-sdk/lib/Resend");
import * as UserSettingsStore from 'matrix-react-sdk/lib/UserSettingsStore';
module.exports = React.createClass({ module.exports = React.createClass({
displayName: 'MessageContextMenu', displayName: 'MessageContextMenu',
@ -163,7 +164,7 @@ module.exports = React.createClass({
{viewSourceButton} {viewSourceButton}
{unhidePreviewButton} {unhidePreviewButton}
{permalinkButton} {permalinkButton}
{quoteButton} {UserSettingsStore.isFeatureEnabled('rich_text_editor') ? quoteButton : null}
</div> </div>
); );
} }