Skip to content
This repository has been archived by the owner on Sep 11, 2024. It is now read-only.

Fixed pagination infinite loop caused by long messages #1045

Merged
merged 1 commit into from
Jun 14, 2017
Merged

Fixed pagination infinite loop caused by long messages #1045

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions src/components/structures/ScrollPanel.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -352,13 +352,14 @@ module.exports = React.createClass({
const tile = tiles[backwards ? i : tiles.length - 1 - i];
// Subtract height of tile as if it were unpaginated
excessHeight -= tile.clientHeight;
//If removing the tile would lead to future pagination, break before setting scroll token
if (tile.clientHeight > excessHeight) {
break;
}
// The tile may not have a scroll token, so guard it
if (tile.dataset.scrollTokens) {
markerScrollToken = tile.dataset.scrollTokens.split(',')[0];
}
if (tile.clientHeight > excessHeight) {
break;
}
}

if (markerScrollToken) {
Expand Down