diff options
| author | Artur <artur@vaadin.com> | 2017-01-30 15:19:55 +0200 |
|---|---|---|
| committer | Denis <denis@vaadin.com> | 2017-01-30 15:19:55 +0200 |
| commit | 8405496a7a6f6808fe829485c677bb73b4fa670c (patch) | |
| tree | 10d4f82c2efe09f8cb2dde070e080d4f83886e0a /client | |
| parent | 131e4f34bddf99d61a76fcd49890490c78c3efa8 (diff) | |
| download | vaadin-framework-8405496a7a6f6808fe829485c677bb73b4fa670c.tar.gz vaadin-framework-8405496a7a6f6808fe829485c677bb73b4fa670c.zip | |
Prevent reorder of frozen columns when there are hidden columns (#8278)
* Rename variables to indicate whether they use DOM index or Grid index
Grid indexes include hidden columns, DOM/Escalator indexes do not
* Prevent reorder of frozen columns when there are hidden columns
Fixes #8265
* Merge branch '7.7' into _grid-no-reorder-of-frozen-columns
* Merge branch '7.7' into _grid-no-reorder-of-frozen-columns
* Merge branch '7.7' into _grid-no-reorder-of-frozen-columns
* Merge branch '7.7' into _grid-no-reorder-of-frozen-columns
* Merge branch '7.7' into _grid-no-reorder-of-frozen-columns
* Merge branch '7.7' into _grid-no-reorder-of-frozen-columns
* Merge branch '7.7' into _grid-no-reorder-of-frozen-columns
Diffstat (limited to 'client')
| -rwxr-xr-x | client/src/main/java/com/vaadin/client/widgets/Grid.java | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/client/src/main/java/com/vaadin/client/widgets/Grid.java b/client/src/main/java/com/vaadin/client/widgets/Grid.java index d215b3c565..7ef2167f1c 100755 --- a/client/src/main/java/com/vaadin/client/widgets/Grid.java +++ b/client/src/main/java/com/vaadin/client/widgets/Grid.java @@ -7602,8 +7602,7 @@ public class Grid<T> extends ResizeComposite implements HasSelectionHandlers<T>, if (!event.getCell().isHeader()) { return; } - if (event.getCell().getColumnIndex() < escalator - .getColumnConfiguration().getFrozenColumnCount()) { + if (event.getCell().getColumnIndex() < getFrozenColumnCount()) { return; } |