aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJarno Rantala <jarno.rantala@vaadin.com>2014-01-17 17:28:08 +0200
committerVaadin Code Review <review@vaadin.com>2014-01-31 11:17:54 +0000
commit16e079fcaed8cf531187475527ae52e7cf2d2504 (patch)
treeb06fafd92155ec0ceef1ead1955495ca4d3657d6
parent3bfd0046eaead75e6b8cac7dc7b2d1ecceb25dc9 (diff)
downloadvaadin-framework-16e079fcaed8cf531187475527ae52e7cf2d2504.tar.gz
vaadin-framework-16e079fcaed8cf531187475527ae52e7cf2d2504.zip
Prevent setting firstRowInViewPort to negative value (#13008)
This should fix MultiSelectWithRemovedRow test in IE. Change-Id: I54f4ba1cc5c1efeea1582cc0314cfb9a4a859279
-rw-r--r--client/src/com/vaadin/client/ui/VScrollTable.java5
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 3c574f8f92..e800e7fe79 100644
--- a/client/src/com/vaadin/client/ui/VScrollTable.java
+++ b/client/src/com/vaadin/client/ui/VScrollTable.java
@@ -6965,8 +6965,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