aboutsummaryrefslogtreecommitdiffstats
path: root/client
diff options
context:
space:
mode:
authorAnthony Guerreiro <anthony@vaadin.com>2014-08-06 09:06:00 +0100
committerAnthony Guerreiro <anthony@vaadin.com>2014-08-06 09:06:00 +0100
commitd6e247f0d3004e643f5f1fd63aa8d4970a3a07a2 (patch)
tree54179334984ceb510bf9cf710631fd8d713040fa /client
parent72ae78fc92656deb89deff752f2195d14158de45 (diff)
downloadvaadin-framework-d6e247f0d3004e643f5f1fd63aa8d4970a3a07a2.tar.gz
vaadin-framework-d6e247f0d3004e643f5f1fd63aa8d4970a3a07a2.zip
Fix regression caused by #14147 patch (#14147)
The previous patch caused TestCurrentPageFirstItem to fail. Change-Id: I6eec8818f5ba2ce847a696afa40ba423ec482668
Diffstat (limited to 'client')
-rw-r--r--client/src/com/vaadin/client/ui/VScrollTable.java2
-rw-r--r--client/src/com/vaadin/client/ui/table/TableConnector.java14
2 files changed, 8 insertions, 8 deletions
diff --git a/client/src/com/vaadin/client/ui/VScrollTable.java b/client/src/com/vaadin/client/ui/VScrollTable.java
index 59645aa6d3..8c1a92830d 100644
--- a/client/src/com/vaadin/client/ui/VScrollTable.java
+++ b/client/src/com/vaadin/client/ui/VScrollTable.java
@@ -1177,7 +1177,7 @@ public class VScrollTable extends FlowPanel implements HasWidgets,
@Override
public void execute() {
- if (firstvisible > 0) {
+ if (firstvisible >= 0) {
firstRowInViewPort = firstvisible;
if (firstvisibleOnLastPage > -1) {
scrollBodyPanel
diff --git a/client/src/com/vaadin/client/ui/table/TableConnector.java b/client/src/com/vaadin/client/ui/table/TableConnector.java
index d37fd36522..56b35cce56 100644
--- a/client/src/com/vaadin/client/ui/table/TableConnector.java
+++ b/client/src/com/vaadin/client/ui/table/TableConnector.java
@@ -1,12 +1,12 @@
/*
* Copyright 2000-2014 Vaadin Ltd.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy of
* the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -64,7 +64,7 @@ public class TableConnector extends AbstractHasComponentsConnector implements
/*
* (non-Javadoc)
- *
+ *
* @see com.vaadin.client.Paintable#updateFromUIDL(com.vaadin.client.UIDL,
* com.vaadin.client.ApplicationConnection)
*/
@@ -121,7 +121,7 @@ public class TableConnector extends AbstractHasComponentsConnector implements
int previousTotalRows = getWidget().totalRows;
getWidget().updateTotalRows(uidl);
- boolean totalRowsChanged = (getWidget().totalRows != previousTotalRows);
+ boolean totalRowsHaveChanged = (getWidget().totalRows != previousTotalRows);
getWidget().updateDragMode(uidl);
@@ -199,7 +199,7 @@ public class TableConnector extends AbstractHasComponentsConnector implements
if (getWidget().headerChangedDuringUpdate) {
getWidget().triggerLazyColumnAdjustment(true);
} else if (!getWidget().isScrollPositionVisible()
- || totalRowsChanged
+ || totalRowsHaveChanged
|| getWidget().lastRenderedHeight != getWidget().scrollBody
.getOffsetHeight()) {
// webkits may still bug with their disturbing scrollbar
@@ -384,7 +384,7 @@ public class TableConnector extends AbstractHasComponentsConnector implements
/**
* Shows a saved row context menu if the row for the context menu is still
* visible. Does nothing if a context menu has not been saved.
- *
+ *
* @param savedContextMenu
*/
public void showSavedContextMenu(ContextMenuDetails savedContextMenu) {