summaryrefslogtreecommitdiffstats
path: root/client
diff options
context:
space:
mode:
authorSauli Tähkäpää <sauli@vaadin.com>2015-09-03 22:21:40 +0300
committerJohannes Dahlström <johannesd@vaadin.com>2015-11-02 11:43:16 +0000
commit3688133b20f55174774191ee434c30465eb1a1b0 (patch)
treec1f63a2e905a190fdac9b8c511db48d444a4d5dd /client
parent1798cc8fcc4a17916ca72788c205f27d374ca63d (diff)
downloadvaadin-framework-3688133b20f55174774191ee434c30465eb1a1b0.tar.gz
vaadin-framework-3688133b20f55174774191ee434c30465eb1a1b0.zip
Reset sort indicator when saving editor. (#17428)
Change-Id: Idaaf707bdb4178ff4ff5dfc7af853f08d5690b5e
Diffstat (limited to 'client')
-rw-r--r--client/src/com/vaadin/client/widgets/Grid.java11
1 files changed, 10 insertions, 1 deletions
diff --git a/client/src/com/vaadin/client/widgets/Grid.java b/client/src/com/vaadin/client/widgets/Grid.java
index a77499e41f..c25f2e5942 100644
--- a/client/src/com/vaadin/client/widgets/Grid.java
+++ b/client/src/com/vaadin/client/widgets/Grid.java
@@ -1321,6 +1321,7 @@ public class Grid<T> extends ResizeComposite implements
if (state == State.SAVING) {
cleanup();
cancel();
+ grid.clearSortOrder();
}
}
@@ -7612,6 +7613,14 @@ public class Grid<T> extends ResizeComposite implements
setSortOrder(order, false);
}
+ /**
+ * Clears the sort order and indicators without re-sorting.
+ */
+ private void clearSortOrder() {
+ sortOrder.clear();
+ refreshHeader();
+ }
+
private void setSortOrder(List<SortOrder> order, boolean userOriginated) {
if (order != sortOrder) {
sortOrder.clear();
@@ -8697,4 +8706,4 @@ public class Grid<T> extends ResizeComposite implements
}
return null;
}
-} \ No newline at end of file
+}