summaryrefslogtreecommitdiffstats
path: root/client
diff options
context:
space:
mode:
Diffstat (limited to 'client')
-rw-r--r--client/src/com/vaadin/client/ui/VScrollTable.java19
1 files changed, 11 insertions, 8 deletions
diff --git a/client/src/com/vaadin/client/ui/VScrollTable.java b/client/src/com/vaadin/client/ui/VScrollTable.java
index f8b1ff8d83..7ec6845a11 100644
--- a/client/src/com/vaadin/client/ui/VScrollTable.java
+++ b/client/src/com/vaadin/client/ui/VScrollTable.java
@@ -1082,18 +1082,14 @@ public class VScrollTable extends FlowPanel implements HasWidgets,
selected = true;
keyboardSelectionOverRowFetchInProgress = true;
}
- if (isSingleSelectMode() && selected) {
+ if (selected) {
if (focusedRow == null
|| !selectedRowKeys.contains(focusedRow
.getKey())) {
/*
- * The focus is no longer on a selected row. If we
- * are in single select mode, move focus to the
- * selected row. (#10522)
- *
- * Don't modify the focused row when in multiselect
- * mode. (#13341)
+ * The focus is no longer on a selected row. Move
+ * focus to the selected row. (#10522)
*/
setRowFocus(row);
@@ -7266,7 +7262,14 @@ public class VScrollTable extends FlowPanel implements HasWidgets,
// Set new focused row
focusedRow = row;
- ensureRowIsVisible(row);
+ /*
+ * Don't scroll to the focused row when in multiselect mode.
+ * (#13341)
+ */
+
+ if (isSingleSelectMode()) {
+ ensureRowIsVisible(row);
+ }
return true;
}