Skip to content

Commit 584d41c

Browse files
authored
fix confirmation message cancel button (#1168)
1 parent 523e46f commit 584d41c

File tree

1 file changed

+14
-3
lines changed

1 file changed

+14
-3
lines changed

assets/ajax/naja.ts

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -77,10 +77,17 @@ export class NajaAjax<C extends Naja = Naja, G extends Datagrid = Datagrid> exte
7777
throw new Error("Element is not an instanceof HTMLElement");
7878
}
7979

80-
return this.dispatch('interact', {
80+
const dispatchResult = this.dispatch('interact', {
8181
...e.detail,
8282
element: e.detail.element as HTMLElement // Naja's event has a type of HTMLElement
83-
})
83+
});
84+
85+
if (!dispatchResult) {
86+
e.stopPropagation();
87+
e.preventDefault();
88+
}
89+
90+
return dispatchResult;
8491
})
8592

8693

@@ -122,7 +129,11 @@ export class NajaAjax<C extends Naja = Naja, G extends Datagrid = Datagrid> exte
122129
dispatch<
123130
K extends string, M extends BaseAjaxEventMap = AjaxEventMap
124131
>(type: K, detail: K extends keyof M ? EventDetail<M[K]> : any, options?: boolean): boolean {
125-
return this.dispatchEvent(new CustomEvent(type, {detail}));
132+
return this.dispatchEvent(new CustomEvent(type, {
133+
detail: detail,
134+
cancelable: true,
135+
}));
136+
126137
}
127138

128139
declare addEventListener: <K extends keyof M, M extends BaseAjaxEventMap = AjaxEventMap>(

0 commit comments

Comments
 (0)