don't show RRs if manageRRs is false
This commit is contained in:
parent
334564c814
commit
7174648f94
2 changed files with 8 additions and 1 deletions
|
@ -60,6 +60,9 @@ module.exports = React.createClass({
|
||||||
// true to suppress the date at the start of the timeline
|
// true to suppress the date at the start of the timeline
|
||||||
suppressFirstDateSeparator: React.PropTypes.bool,
|
suppressFirstDateSeparator: React.PropTypes.bool,
|
||||||
|
|
||||||
|
// whether to show read receipts
|
||||||
|
manageReadReceipts: React.PropTypes.bool,
|
||||||
|
|
||||||
// true if updates to the event list should cause the scroll panel to
|
// true if updates to the event list should cause the scroll panel to
|
||||||
// scroll down when we are at the bottom of the window. See ScrollPanel
|
// scroll down when we are at the bottom of the window. See ScrollPanel
|
||||||
// for more details.
|
// for more details.
|
||||||
|
@ -373,7 +376,10 @@ module.exports = React.createClass({
|
||||||
// Local echos have a send "status".
|
// Local echos have a send "status".
|
||||||
var scrollToken = mxEv.status ? undefined : eventId;
|
var scrollToken = mxEv.status ? undefined : eventId;
|
||||||
|
|
||||||
var readReceipts = this._getReadReceiptsForEvent(mxEv);
|
var readReceipts;
|
||||||
|
if (this.props.manageReadReceipts) {
|
||||||
|
readReceipts = this._getReadReceiptsForEvent(mxEv);
|
||||||
|
}
|
||||||
|
|
||||||
ret.push(
|
ret.push(
|
||||||
<li key={eventId}
|
<li key={eventId}
|
||||||
|
|
|
@ -972,6 +972,7 @@ var TimelinePanel = React.createClass({
|
||||||
readMarkerVisible={ this.state.readMarkerVisible }
|
readMarkerVisible={ this.state.readMarkerVisible }
|
||||||
suppressFirstDateSeparator={ this.state.canBackPaginate }
|
suppressFirstDateSeparator={ this.state.canBackPaginate }
|
||||||
showUrlPreview = { this.props.showUrlPreview }
|
showUrlPreview = { this.props.showUrlPreview }
|
||||||
|
manageReadReceipts = { this.props.manageReadReceipts }
|
||||||
ourUserId={ MatrixClientPeg.get().credentials.userId }
|
ourUserId={ MatrixClientPeg.get().credentials.userId }
|
||||||
stickyBottom={ stickyBottom }
|
stickyBottom={ stickyBottom }
|
||||||
onScroll={ this.onMessageListScroll }
|
onScroll={ this.onMessageListScroll }
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue