matrix/matrix-react-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-react-sdk.git synced 2025-07-16 22:01:54 +03:00
Code Activity

Merge branch 'develop' into luke/feature-sticky-date-separators

Browse Source
This commit is contained in:
Luke Barnard
2017-08-30 14:06:06 +01:00
parent d516906b36 32b33c66b9
commit a29e7da06b
45 changed files with 735 additions and 249 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -62,7 +62,7 @@ module.exports = React.createClass({
ourUserId: React.PropTypes.string,
// whether to show read receipts
manageReadReceipts: React.PropTypes.bool,
showReadReceipts: React.PropTypes.bool,
// 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
@ -488,7 +488,7 @@ module.exports = React.createClass({
var scrollToken = mxEv.status ? undefined : eventId;
var readReceipts;
if (this.props.manageReadReceipts) {
if (this.props.showReadReceipts) {
readReceipts = this._getReadReceiptsForEvent(mxEv);
}
ret.push(