OpenCloud
/
element-web
mirror of https://github.com/vector-im/element-web
1
0
Fork 0
Code Issues Releases Wiki Activity

feature flag for displaying edits as well

pull/21833/head
Bruno Windels 2019-06-21 18:32:15 +02:00
parent 50315557ba
commit 5fa3f70fb4
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/components/structures/MessagePanel.js
View File

@ -576,6 +576,7 @@ module.exports = React.createClass({
const scrollToken = mxEv.status ? undefined : eventId; const scrollToken = mxEv.status ? undefined : eventId;
const readReceipts = this._readReceiptsByEvent[eventId]; const readReceipts = this._readReceiptsByEvent[eventId];
const editingEnabled = SettingsStore.isFeatureEnabled("feature_message_editing");
ret.push( ret.push(
<li key={eventId} <li key={eventId}
@ -585,7 +586,7 @@ module.exports = React.createClass({
<EventTile mxEvent={mxEv} <EventTile mxEvent={mxEv}
continuation={continuation} continuation={continuation}
isRedacted={mxEv.isRedacted()} isRedacted={mxEv.isRedacted()}
replacingEventId={mxEv.replacingEventId()} replacingEventId={editingEnabled && mxEv.replacingEventId()}
editState={isEditing && this.props.editState} editState={isEditing && this.props.editState}
onHeightChanged={this._onHeightChanged} onHeightChanged={this._onHeightChanged}
readReceipts={readReceipts} readReceipts={readReceipts}

2
src/components/views/rooms/EventTile.js
View File

@ -829,7 +829,7 @@ module.exports.haveTileForEvent = function(e) {
if (e.isRedacted() && !isMessageEvent(e)) return false; if (e.isRedacted() && !isMessageEvent(e)) return false;
// No tile for replacement events since they update the original tile // No tile for replacement events since they update the original tile
if (e.isRelation("m.replace")) return false; if (e.isRelation("m.replace") && SettingsStore.isFeatureEnabled("feature_message_editing")) return false;
const handler = getHandlerTile(e); const handler = getHandlerTile(e);
if (handler === undefined) return false; if (handler === undefined) return false;

2
src/shouldHideEvent.js
View File

@ -47,7 +47,7 @@ export default function shouldHideEvent(ev) {
if (ev.isRedacted() && !isEnabled('showRedactions')) return true; if (ev.isRedacted() && !isEnabled('showRedactions')) return true;
// Hide replacement events since they update the original tile // Hide replacement events since they update the original tile
if (ev.isRelation("m.replace")) return true; if (ev.isRelation("m.replace") && SettingsStore.isFeatureEnabled("feature_message_editing")) return true;
const eventDiff = memberEventDiff(ev); const eventDiff = memberEventDiff(ev);