diff options
| -rw-r--r-- | client/src/com/vaadin/client/ui/grid/GridConnector.java | 9 | ||||
| -rw-r--r-- | uitest/src/com/vaadin/tests/components/grid/basicfeatures/GridKeyboardNavigationTest.java | 6 |
2 files changed, 7 insertions, 8 deletions
diff --git a/client/src/com/vaadin/client/ui/grid/GridConnector.java b/client/src/com/vaadin/client/ui/grid/GridConnector.java index ca66ccc3d5..a2563488d3 100644 --- a/client/src/com/vaadin/client/ui/grid/GridConnector.java +++ b/client/src/com/vaadin/client/ui/grid/GridConnector.java @@ -262,6 +262,9 @@ public class GridConnector extends AbstractComponentConnector { getWidget().addSelectionChangeHandler(internalSelectionChangeHandler); + // TODO: Remove this workaround once we have header/footer communication + getWidget().getFooter().appendRow(); + getWidget().addSortHandler(new SortEventHandler<JSONObject>() { @Override public void sort(SortEvent<JSONObject> event) { @@ -320,14 +323,12 @@ public class GridConnector extends AbstractComponentConnector { // Header if (stateChangeEvent.hasPropertyChanged("columnHeadersVisible")) { - getWidget() - .setColumnHeadersVisible(getState().columnHeadersVisible); + getWidget().getHeader().setVisible(getState().columnHeadersVisible); } // Footer if (stateChangeEvent.hasPropertyChanged("columnFootersVisible")) { - getWidget() - .setColumnFootersVisible(getState().columnFootersVisible); + getWidget().getFooter().setVisible(getState().columnFootersVisible); } // Column row groups diff --git a/uitest/src/com/vaadin/tests/components/grid/basicfeatures/GridKeyboardNavigationTest.java b/uitest/src/com/vaadin/tests/components/grid/basicfeatures/GridKeyboardNavigationTest.java index 4c26124a51..805213027e 100644 --- a/uitest/src/com/vaadin/tests/components/grid/basicfeatures/GridKeyboardNavigationTest.java +++ b/uitest/src/com/vaadin/tests/components/grid/basicfeatures/GridKeyboardNavigationTest.java @@ -70,18 +70,16 @@ public class GridKeyboardNavigationTest extends GridBasicFeaturesTest { assertTrue("Body cell 1, 1 is not active after keyboard navigation.", grid.getCell(1, 1).isActive()); - Actions manyClicks = new Actions(getDriver()); int i; for (i = 1; i < 40; ++i) { - manyClicks.sendKeys(Keys.ARROW_DOWN); + new Actions(getDriver()).sendKeys(Keys.ARROW_DOWN).perform(); } - manyClicks.perform(); assertFalse("Grid has not scrolled with active cell", isElementPresent(By.xpath("//td[text() = '(0, 0)']"))); assertTrue("Active cell is not visible", isElementPresent(By.xpath("//td[text() = '(" + i + ", 0)']"))); - assertTrue("Body cell" + i + ", 1 is not active", grid.getCell(i, 1) + assertTrue("Body cell " + i + ", 1 is not active", grid.getCell(i, 1) .isActive()); } |