diff options
| author | Jonatan Kronqvist <jonatan@vaadin.com> | 2014-02-10 09:55:12 +0200 |
|---|---|---|
| committer | Jonatan Kronqvist <jonatan@vaadin.com> | 2014-02-10 09:55:12 +0200 |
| commit | 5284b8b28424c18dd8eb869ca97a6e8457d999b6 (patch) | |
| tree | 19b462f4702d84ed380bf140275546202348212e | |
| parent | 7e1006430c9c5f2647dbf78d2a2abee981e9f27d (diff) | |
| parent | 16e079fcaed8cf531187475527ae52e7cf2d2504 (diff) | |
| download | vaadin-framework-5284b8b28424c18dd8eb869ca97a6e8457d999b6.tar.gz vaadin-framework-5284b8b28424c18dd8eb869ca97a6e8457d999b6.zip | |
Merge changes from origin/7.1
16e079f Prevent setting firstRowInViewPort to negative value (#13008)
Change-Id: I5214fef75d24688c40076e209a77fd24420d7316
| -rw-r--r-- | client/src/com/vaadin/client/ui/VScrollTable.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/client/src/com/vaadin/client/ui/VScrollTable.java b/client/src/com/vaadin/client/ui/VScrollTable.java index 10dbc71901..f4bd582a85 100644 --- a/client/src/com/vaadin/client/ui/VScrollTable.java +++ b/client/src/com/vaadin/client/ui/VScrollTable.java @@ -6977,8 +6977,9 @@ public class VScrollTable extends FlowPanel implements HasWidgets, } firstRowInViewPort = calcFirstRowInViewPort(); - if (firstRowInViewPort > totalRows - pageLength) { - firstRowInViewPort = totalRows - pageLength; + int maxFirstRow = totalRows - pageLength; + if (firstRowInViewPort > maxFirstRow && maxFirstRow >= 0) { + firstRowInViewPort = maxFirstRow; } int postLimit = (int) (firstRowInViewPort + (pageLength - 1) + pageLength |