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

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
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(