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

Merge pull request #3236 from matrix-org/jryans/v1.4.0/dontredactfirst

Browse source 
Don't show remove button for original event in edit history
This commit is contained in:
J. Ryan Stinnett 2019-07-18 14:40:58 +01:00 committed by GitHub
commit 4a7264cc15
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/components/views/dialogs/MessageEditHistoryDialog.js
View file

@ -107,11 +107,19 @@ export default class MessageEditHistoryDialog extends React.PureComponent {
if (this.state.originalEvent && !this.state.nextBatch) { if (this.state.originalEvent && !this.state.nextBatch) {
allEvents = allEvents.concat(this.state.originalEvent); allEvents = allEvents.concat(this.state.originalEvent);
} }
const baseEventId = this.props.mxEvent.getId();
allEvents.forEach(e => { allEvents.forEach(e => {
if (!lastEvent || wantsDateSeparator(lastEvent.getDate(), e.getDate())) { if (!lastEvent || wantsDateSeparator(lastEvent.getDate(), e.getDate())) {
nodes.push(<li key={e.getTs() + "~"}><DateSeparator ts={e.getTs()} /></li>); nodes.push(<li key={e.getTs() + "~"}><DateSeparator ts={e.getTs()} /></li>);
} }
nodes.push(<EditHistoryMessage key={e.getId()} mxEvent={e} isTwelveHour={this.state.isTwelveHour} />); const isBaseEvent = e.getId() === baseEventId;
nodes.push((
<EditHistoryMessage
key={e.getId()}
isBaseEvent={isBaseEvent}
mxEvent={e}
isTwelveHour={this.state.isTwelveHour}
/>));
lastEvent = e; lastEvent = e;
}); });
return nodes; return nodes;

2
src/components/views/messages/EditHistoryMessage.js
View file

@ -94,7 +94,7 @@ export default class EditHistoryMessage extends React.PureComponent {
const AccessibleButton = sdk.getComponent('elements.AccessibleButton'); const AccessibleButton = sdk.getComponent('elements.AccessibleButton');
// hide the button when already redacted // hide the button when already redacted
let redactButton; let redactButton;
if (!this.props.mxEvent.isRedacted()) { if (!this.props.mxEvent.isRedacted() && !this.props.isBaseEvent) {
redactButton = ( redactButton = (
<AccessibleButton onClick={this._onRedactClick} disabled={!this.state.canRedact}> <AccessibleButton onClick={this._onRedactClick} disabled={!this.state.canRedact}>
{_t("Remove")} {_t("Remove")}