diff options
| author | Johannes Dahlström <johannesd@vaadin.com> | 2012-06-11 15:59:16 +0300 |
|---|---|---|
| committer | Johannes Dahlström <johannesd@vaadin.com> | 2012-06-11 15:59:16 +0300 |
| commit | 1973707aa1a2131e4a99339b3d2626c2b9acce1a (patch) | |
| tree | 573d07ac9c9592fb2d54de91bd658196d3399963 /src | |
| parent | 96c39f2936ba0cd226d87b0dd0e5651d2767a4c2 (diff) | |
| parent | e8844544fcf3f62e9b8a9226e235b90a7106d881 (diff) | |
| download | vaadin-framework-1973707aa1a2131e4a99339b3d2626c2b9acce1a.tar.gz vaadin-framework-1973707aa1a2131e4a99339b3d2626c2b9acce1a.zip | |
Merge commit 'e8844'
Conflicts:
src/com/vaadin/terminal/gwt/client/ui/table/VScrollTable.java
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/vaadin/terminal/gwt/client/ui/table/VScrollTable.java | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/com/vaadin/terminal/gwt/client/ui/table/VScrollTable.java b/src/com/vaadin/terminal/gwt/client/ui/table/VScrollTable.java index 4565c28fa5..64018fa49c 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/table/VScrollTable.java +++ b/src/com/vaadin/terminal/gwt/client/ui/table/VScrollTable.java @@ -1900,6 +1900,9 @@ public class VScrollTable extends FlowPanel implements HasWidgets, return true; } } else { + if (scrollBody == null) { + return false; + } int fakeheight = (int) Math.round(scrollBody.getRowHeight() * totalRows); int availableHeight = scrollBodyPanel.getElement().getPropertyInt( |