imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #3132 from matrix-org/bwindels/edit-full-feature-flag

Browse source 
feature flag for displaying edits as well
This commit is contained in:
Bruno Windels 2019-06-24 21:00:58 +00:00 • committed by GitHub
commit a9b5d2095c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -108,6 +108,7 @@ module.exports = React.createClass({
}, },
componentWillMount: function() { componentWillMount: function() {
this._editingEnabled = SettingsStore.isFeatureEnabled("feature_message_editing");
// the event after which we put a visible unread marker on the last // the event after which we put a visible unread marker on the last
// render cycle; null if readMarkerVisible was false or the RM was // render cycle; null if readMarkerVisible was false or the RM was
// suppressed (eg because it was at the end of the timeline) // suppressed (eg because it was at the end of the timeline)
@ -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={this._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;

4
src/shouldHideEvent.js
View file

@ -46,8 +46,8 @@ export default function shouldHideEvent(ev) {
// Hide redacted events // Hide redacted events
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 enabled)
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);