fix #281 reset group/sort

lineupjs · Apr 6, 2020 · 8eb7574 · 8eb7574
1 parent 05034e0
commit 8eb7574
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/src/ui/dialogs/GroupDialog.ts b/src/ui/dialogs/GroupDialog.ts
@@ -90,12 +90,14 @@ function sortOrder(node: HTMLElement, column: Column, idPrefix: string): IToolba
     elems: `input[name=grouped], #${id}P`,
     submit() {
       const enabled = node.querySelector<HTMLInputElement>('input[name=grouped]:checked')!.value === 'true';
-      const order = Number.parseInt(node.querySelector<HTMLInputElement>(`#${id}P`)!.value, 10);
+      const order = Number.parseInt(node.querySelector<HTMLInputElement>(`#${id}P`)!.value, 10) - 1;
       ranking.groupBy(column, !enabled ? -1 : order);
       return true;
     },
     reset() {
-      // things need to be done?
+      node.querySelector<HTMLInputElement>('input[name=grouped][value=false]')!.checked = true;
+      node.querySelector<HTMLInputElement>(`#${id}P`)!.value = (current.length + (!enabled ? 1 : 0)).toString();
+      updateDisabled(true);
     },
     cancel() {
       ranking.groupBy(column, current.indexOf(column));

diff --git a/src/ui/dialogs/SortDialog.ts b/src/ui/dialogs/SortDialog.ts
@@ -87,7 +87,7 @@ function sortOrder(node: HTMLElement, column: Column, idPrefix: string, groupSor
     elems: `input[name=sortorder], #${id}P`,
     submit() {
       const asc = node.querySelector<HTMLInputElement>('input[name=sortorder]:checked')!.value;
-      const priority = Number.parseInt(node.querySelector<HTMLInputElement>(`#${id}P`)!.value, 10);
+      const priority = Number.parseInt(node.querySelector<HTMLInputElement>(`#${id}P`)!.value, 10) - 1;
 
       if (groupSortBy) {
         ranking.groupSortBy(column, asc === 'asc', asc === 'none' ? -1 : priority);
@@ -97,7 +97,9 @@ function sortOrder(node: HTMLElement, column: Column, idPrefix: string, groupSor
       return true;
     },
     reset() {
-      // things need to be done?
+      node.querySelector<HTMLInputElement>('input[name=sortorder][value=none]')!.checked = true;
+      node.querySelector<HTMLInputElement>(`#${id}P`)!.value = (current.length + (order.priority === undefined ? 1 : 0)).toString();
+      updateDisabled(true);
     },
     cancel() {
       if (groupSortBy) {