ZIP Imports: Added parent selector for page/chapter imports

[bookstack] / resources / js / wysiwyg / ui / framework / modals.ts

diff --git a/resources/js/wysiwyg/ui/framework/modals.ts b/resources/js/wysiwyg/ui/framework/modals.ts
index bfc5fc619bf302fc54f59b4d4f90d0cb2bf4a158..3eea62ebb94d9cca2e1ab1ae9bfff7f1990467e0 100644 (file)
--- a/resources/js/wysiwyg/ui/framework/modals.ts
+++ b/resources/js/wysiwyg/ui/framework/modals.ts
@@ -1,7 +1,7 @@
 import {EditorForm, EditorFormDefinition} from "./forms";
-import {el} from "../../helpers";
 import {EditorContainerUiElement} from "./core";
-
+import closeIcon from "@icons/close.svg";
+import {el} from "../../utils/dom";
 
 export interface EditorModalDefinition {
     title: string;
@@ -13,10 +13,12 @@ export interface EditorFormModalDefinition extends EditorModalDefinition {
 
 export class EditorFormModal extends EditorContainerUiElement {
     protected definition: EditorFormModalDefinition;
+    protected key: string;
 
-    constructor(definition: EditorFormModalDefinition) {
+    constructor(definition: EditorFormModalDefinition, key: string) {
         super([new EditorForm(definition.form)]);
         this.definition = definition;
+        this.key = key;
     }
 
     show(defaultValues: Record<string, string>) {
@@ -26,18 +28,27 @@ export class EditorFormModal extends EditorContainerUiElement {
         const form = this.getForm();
         form.setValues(defaultValues);
         form.setOnCancel(this.hide.bind(this));
+        form.setOnSuccessfulSubmit(this.hide.bind(this));
+
+        this.getContext().manager.setModalActive(this.key, this);
     }
 
     hide() {
         this.getDOMElement().remove();
+        this.getContext().manager.setModalInactive(this.key);
     }
 
-    protected getForm(): EditorForm {
+    getForm(): EditorForm {
         return this.children[0] as EditorForm;
     }
 
     protected buildDOM(): HTMLElement {
-        const closeButton = el('button', {class: 'editor-modal-close', type: 'button', title: this.trans('Close')}, ['x']);
+        const closeButton = el('button', {
+            class: 'editor-modal-close',
+            type: 'button',
+            title: this.trans('Close'),
+        });
+        closeButton.innerHTML = closeIcon;
         closeButton.addEventListener('click', this.hide.bind(this));
 
         const modal = el('div', {class: 'editor-modal editor-form-modal'}, [