matrix/matrix-react-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-react-sdk.git synced 2025-07-12 12:41:46 +03:00
Code Activity

Merge commit '99d2392' into rav/roomview_works

Browse Source 
Conflicts:
	src/components/structures/RoomView.js
This commit is contained in:
Richard van der Hoff
2016-02-23 13:32:23 +00:00
parent 862e3c8c43 99d2392b6f
commit ac4b36c0dd
7 changed files with 57 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/components/structures/RoomView.js
View File

@ -722,6 +722,15 @@ module.exports = React.createClass({
}
}
// once images in the search results load, make the scrollPanel check
// the scroll offsets.
var onImageLoad = () => {
var scrollPanel = this.refs.searchResultsPanel;
if (scrollPanel) {
scrollPanel.checkScroll();
}
}
var lastRoomId;
for (var i = this.state.searchResults.results.length - 1; i >= 0; i--) {
@ -758,7 +767,8 @@ module.exports = React.createClass({
ret.push(<SearchResultTile key={mxEv.getId()}
searchResult={result}
searchHighlights={this.state.searchHighlights}
resultLink={resultLink}/>);
resultLink={resultLink}
onImageLoad={onImageLoad}/>);
}
return ret;
},