matrix/matrix-react-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-react-sdk.git synced 2025-06-26 04:01:04 +03:00
Code Activity

Merge branch 'rav/roomview_works' into develop

Browse Source 
Implementation of new read-marker semantics (PR #160).
This commit is contained in:
Richard van der Hoff
2016-02-24 17:26:34 +00:00
parent 1959b03104
commit 10b55036f9
6 changed files with 359 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/components/structures/ScrollPanel.js
View File

@ -328,13 +328,13 @@ module.exports = React.createClass({
// pixelOffset gives the number of pixels between the bottom of the node
// and the bottom of the container. If undefined, it will put the node
// in the middle of the container.
// 1/3 of the way down the container.
scrollToToken: function(scrollToken, pixelOffset) {
var scrollNode = this._getScrollNode();
// default to the middle
// default to 1/3 of the way down
if (pixelOffset === undefined) {
pixelOffset = scrollNode.clientHeight / 2;
pixelOffset = (scrollNode.clientHeight * 2)/ 3;
}
// save the desired scroll state. It's important we do this here rather