Merge pull request #1208 from matrix-org/rav/timelinepanel_test_flakiness

Fix a flaky test in the timelinepanel code
This commit is contained in:
Luke Barnard 2017-07-11 18:10:55 +01:00 committed by GitHub
commit 3bab720a7b
2 changed files with 14 additions and 8 deletions

View file

@ -350,9 +350,9 @@ var TimelinePanel = React.createClass({
});
},
onMessageListScroll: function() {
onMessageListScroll: function(e) {
if (this.props.onScroll) {
this.props.onScroll();
this.props.onScroll(e);
}
if (this.props.manageReadMarkers) {