aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohannes Dahlström <johannesd@vaadin.com>2014-07-07 14:16:02 +0300
committerVaadin Code Review <review@vaadin.com>2014-07-07 11:50:48 +0000
commit255a8ae1aea462e1c0a0241d8fabb189932a97ec (patch)
tree5548a80578cf96a041c6084385f2a768e5acb3d4
parent20e2a3b5eefa03b2d4db8af15e30d1958bc7047f (diff)
downloadvaadin-framework-255a8ae1aea462e1c0a0241d8fabb189932a97ec.tar.gz
vaadin-framework-255a8ae1aea462e1c0a0241d8fabb189932a97ec.zip
Call setup on cells in CellIterator.rawPeekNext
Colspan handling requires cells to have elements associated. Change-Id: I28b9c989507b952f4a3549413bff18f39c394cfb
-rw-r--r--client/src/com/vaadin/client/ui/grid/FlyweightRow.java6
1 files changed, 5 insertions, 1 deletions
diff --git a/client/src/com/vaadin/client/ui/grid/FlyweightRow.java b/client/src/com/vaadin/client/ui/grid/FlyweightRow.java
index deaa5e2e3e..f89e2eed52 100644
--- a/client/src/com/vaadin/client/ui/grid/FlyweightRow.java
+++ b/client/src/com/vaadin/client/ui/grid/FlyweightRow.java
@@ -125,7 +125,11 @@ class FlyweightRow implements Row {
public List<FlyweightCell> rawPeekNext(final int n) {
final int from = Math.min(cursor, cells.size());
final int to = Math.min(cursor + n, cells.size());
- return cells.subList(from, to);
+ List<FlyweightCell> nextCells = cells.subList(from, to);
+ for (FlyweightCell cell : nextCells) {
+ cell.setup(this);
+ }
+ return nextCells;
}
public boolean areCellsAttached() {