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

cache setting where it's easy

pull/21833/head
Bruno Windels 2019-06-24 16:53:31 +02:00
parent 5fa3f70fb4
commit 8394e162ad
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
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)
@ -576,7 +577,6 @@ 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}
@ -586,7 +586,7 @@ module.exports = React.createClass({
<EventTile mxEvent={mxEv} <EventTile mxEvent={mxEv}
continuation={continuation} continuation={continuation}
isRedacted={mxEv.isRedacted()} isRedacted={mxEv.isRedacted()}
replacingEventId={editingEnabled && 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}