PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

Take replies out of labs!

Browse source
This commit is contained in:
David Baker 2018-06-20 09:57:11 +01:00
parent 1352abf317
commit e67dae704a
5 changed files with 8 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/components/views/context_menus/MessageContextMenu.js
View file

@ -253,13 +253,11 @@ module.exports = React.createClass({
</div> </div>
); );
if (SettingsStore.isFeatureEnabled("feature_rich_quoting")) {
replyButton = ( replyButton = (
<div className="mx_MessageContextMenu_field" onClick={this.onReplyClick}> <div className="mx_MessageContextMenu_field" onClick={this.onReplyClick}>
{ _t('Reply') } { _t('Reply') }
</div> </div>
); );
}
if (this.state.canPin) { if (this.state.canPin) {
pinButton = ( pinButton = (

2
src/components/views/elements/ReplyThread.js
View file

@ -160,7 +160,7 @@ export default class ReplyThread extends React.Component {
} }
static makeThread(parentEv, onWidgetLoad, ref) { static makeThread(parentEv, onWidgetLoad, ref) {
if (!SettingsStore.isFeatureEnabled("feature_rich_quoting") || !ReplyThread.getParentEventId(parentEv)) { if (!ReplyThread.getParentEventId(parentEv)) {
return <div />; return <div />;
} }
return <ReplyThread parentEv={parentEv} onWidgetLoad={onWidgetLoad} ref={ref} />; return <ReplyThread parentEv={parentEv} onWidgetLoad={onWidgetLoad} ref={ref} />;

3
src/components/views/messages/TextualBody.js
View file

@ -423,8 +423,7 @@ module.exports = React.createClass({
const mxEvent = this.props.mxEvent; const mxEvent = this.props.mxEvent;
const content = mxEvent.getContent(); const content = mxEvent.getContent();
const stripReply = SettingsStore.isFeatureEnabled("feature_rich_quoting") && const stripReply = ReplyThread.getParentEventId(mxEvent);
ReplyThread.getParentEventId(mxEvent);
let body = HtmlUtils.bodyToHtml(content, this.props.highlights, { let body = HtmlUtils.bodyToHtml(content, this.props.highlights, {
disableBigEmoji: SettingsStore.getValue('TextualBody.disableBigEmoji'), disableBigEmoji: SettingsStore.getValue('TextualBody.disableBigEmoji'),
// Part of Replies fallback support // Part of Replies fallback support

2
src/components/views/rooms/MessageComposerInput.js
View file

@ -1181,7 +1181,7 @@ export default class MessageComposerInput extends React.Component {
return ( return (
<div className="mx_MessageComposer_input_wrapper"> <div className="mx_MessageComposer_input_wrapper">
<div className="mx_MessageComposer_autocomplete_wrapper"> <div className="mx_MessageComposer_autocomplete_wrapper">
{ SettingsStore.isFeatureEnabled("feature_rich_quoting") && <ReplyPreview /> } <ReplyPreview />
<Autocomplete <Autocomplete
ref={(e) => this.autocomplete = e} ref={(e) => this.autocomplete = e}
room={this.props.room} room={this.props.room}

6
src/settings/Settings.js
View file

@ -76,12 +76,6 @@ export const SETTINGS = {
// // level is always appended to the end. // // level is always appended to the end.
// supportedLevelsAreOrdered: false, // supportedLevelsAreOrdered: false,
// }, // },
"feature_rich_quoting": {
isFeature: true,
displayName: _td("Message Replies"),
supportedLevels: LEVELS_FEATURE,
default: false,
},
"feature_pinning": { "feature_pinning": {
isFeature: true, isFeature: true,
displayName: _td("Message Pinning"), displayName: _td("Message Pinning"),