adapt demo and only false is invalid submission

lineupjs · Mar 31, 2020 · 08c6b27 · 08c6b27
1 parent 8a2607b
commit 08c6b27
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 8 deletions.
diff --git a/demo/custom_column.html b/demo/custom_column.html
@@ -81,8 +81,17 @@
           <input type="number" name="count" step="1" min="1" value="${val}">
         `);
         const input = node.lastElementChild;
-        input.onchange = () => {
-          col.setFirstN(input.valueAsNumber);
+        return {
+          elems: [input],
+          submit() {
+            col.setFirstN(input.valueAsNumber);
+          },
+          cancel() {
+            col.setFirstN(val);
+          },
+          reset() {
+            input.value = '1';
+          }
         };
       }
     })

diff --git a/src/ui/dialogs/ADialog.ts b/src/ui/dialogs/ADialog.ts
@@ -145,7 +145,7 @@ abstract class ADialog {
       if (!this.node.checkValidity()) {
         return false;
       }
-      if (this.submit()) {
+      if (this.submit() !== false) {
         this.destroy('confirm');
       }
       return false;
@@ -177,7 +177,7 @@ abstract class ADialog {
 
   protected abstract reset(): void;
 
-  protected abstract submit(): boolean;
+  protected abstract submit(): boolean | undefined;
 
   protected abstract cancel(): void;
 

diff --git a/src/ui/dialogs/AddonDialog.ts b/src/ui/dialogs/AddonDialog.ts
@@ -19,7 +19,7 @@ export default class AddonDialog extends ADialog {
 
   protected submit(): boolean {
     for (const handler of this.handlers) {
-      if (!handler.submit()) {
+      if (handler.submit() === false) {
         return false;
       }
     }

diff --git a/src/ui/dialogs/GroupDialog.ts b/src/ui/dialogs/GroupDialog.ts
@@ -31,7 +31,7 @@ export default class GroupDialog extends ADialog {
 
   protected submit() {
     for (const handler of this.handlers) {
-      if (!handler.submit()) {
+      if (handler.submit() === false) {
         return false;
       }
     }

diff --git a/src/ui/dialogs/SortDialog.ts b/src/ui/dialogs/SortDialog.ts
@@ -31,7 +31,7 @@ export default class SortDialog extends ADialog {
 
   protected submit() {
     for (const handler of this.handlers) {
-      if (!handler.submit()) {
+      if (handler.submit() === false) {
         return false;
       }
     }

diff --git a/src/ui/interfaces.ts b/src/ui/interfaces.ts
@@ -39,7 +39,7 @@ export interface IToolbarAction {
 export interface IToolbarDialogAddonHandler {
   elems: string | (HTMLInputElement | HTMLSelectElement | HTMLTextAreaElement)[];
   reset(): void;
-  submit(): boolean;
+  submit(): boolean | undefined;
   cancel(): void;
 }