OpenCloud
/
element-web
mirror of https://github.com/vector-im/element-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Simplify simulated unfill

pull/21833/head
Luke Barnard 2017-04-05 17:48:24 +01:00
parent 5737994957
commit 47f29b9454
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -344,17 +344,17 @@ module.exports = React.createClass({
// pagination.
//
// If backwards is true, we unpaginate (remove) tiles from the back (top).
let i = backwards ? 0 : tiles.length - 1;
while (
(backwards ? i < tiles.length : i > 0) && excessHeight > tiles[i].clientHeight
) {
for (let i = 0; i < tiles.length; i++) {
const tile = tiles[backwards ? tiles.length - 1 - i : i];
// Subtract height of tile as if it were unpaginated
excessHeight -= tiles[i].clientHeight;
excessHeight -= tile.clientHeight;
// The tile may not have a scroll token, so guard it
if (tiles[i].dataset.scrollToken) {
markerScrollToken = tiles[i].dataset.scrollToken;
if (tile.dataset.scrollToken) {
markerScrollToken = tile.dataset.scrollToken;
}
if (tile.clientHeight > excessHeight) {
break;
}
i += backwards ? 1 : -1;
}
if (markerScrollToken) {