Opensearch: Fixed XML declaration when php short tags enabled

[bookstack] / resources / js / wysiwyg / ui / index.ts

diff --git a/resources/js/wysiwyg/ui/index.ts b/resources/js/wysiwyg/ui/index.ts
index a3f150e529ecf5d45e18a9f896e8fdb8036e549a..e7ec6adbcd56b7eff8e6676b89220707ad329617 100644 (file)
--- a/resources/js/wysiwyg/ui/index.ts
+++ b/resources/js/wysiwyg/ui/index.ts
@@ -1,16 +1,15 @@
 import {LexicalEditor} from "lexical";
 import {
-    getCodeToolbarContent,
+    getCodeToolbarContent, getDetailsToolbarContent,
     getImageToolbarContent,
     getLinkToolbarContent,
-    getMainEditorFullToolbar, getTableToolbarContent
-} from "./toolbars";
+    getMainEditorFullToolbar, getMediaToolbarContent, getTableToolbarContent
+} from "./defaults/toolbars";
 import {EditorUIManager} from "./framework/manager";
-import {image as imageFormDefinition, link as linkFormDefinition, media as mediaFormDefinition, source as sourceFormDefinition} from "./defaults/form-definitions";
-import {ImageDecorator} from "./decorators/image";
 import {EditorUiContext} from "./framework/core";
 import {CodeBlockDecorator} from "./decorators/code-block";
 import {DiagramDecorator} from "./decorators/diagram";
+import {modals} from "./defaults/modals";
 
 export function buildEditorUI(container: HTMLElement, element: HTMLElement, scrollContainer: HTMLElement, editor: LexicalEditor, options: Record<string, any>): EditorUiContext {
     const manager = new EditorUIManager();
@@ -20,38 +19,35 @@ export function buildEditorUI(container: HTMLElement, element: HTMLElement, scro
         editorDOM: element,
         scrollDOM: scrollContainer,
         manager,
-        translate: (text: string): string => text,
-        lastSelection: null,
+        translate(text: string): string {
+            const translations = options.translations;
+            return translations[text] || text;
+        },
+        error(error: string|Error): void {
+            const message = error instanceof Error ? error.message : error;
+            window.$events.error(message); // TODO - Translate
+        },
         options,
     };
     manager.setContext(context);
 
     // Create primary toolbar
-    manager.setToolbar(getMainEditorFullToolbar());
+    manager.setToolbar(getMainEditorFullToolbar(context));
 
     // Register modals
-    manager.registerModal('link', {
-        title: 'Insert/Edit link',
-        form: linkFormDefinition,
-    });
-    manager.registerModal('image', {
-        title: 'Insert/Edit Image',
-        form: imageFormDefinition
-    });
-    manager.registerModal('media', {
-        title: 'Insert/Edit Media',
-        form: mediaFormDefinition,
-    });
-    manager.registerModal('source', {
-        title: 'Source code',
-        form: sourceFormDefinition,
-    });
+    for (const key of Object.keys(modals)) {
+        manager.registerModal(key, modals[key]);
+    }
 
     // Register context toolbars
     manager.registerContextToolbar('image', {
         selector: 'img:not([drawio-diagram] img)',
         content: getImageToolbarContent(),
     });
+    manager.registerContextToolbar('media', {
+        selector: '.editor-media-wrap',
+        content: getMediaToolbarContent(),
+    });
     manager.registerContextToolbar('link', {
         selector: 'a',
         content: getLinkToolbarContent(),
@@ -64,7 +60,6 @@ export function buildEditorUI(container: HTMLElement, element: HTMLElement, scro
         selector: '.editor-code-block-wrap',
         content: getCodeToolbarContent(),
     });
-
     manager.registerContextToolbar('table', {
         selector: 'td,th',
         content: getTableToolbarContent(),
@@ -72,9 +67,12 @@ export function buildEditorUI(container: HTMLElement, element: HTMLElement, scro
             return originalTarget.closest('table') as HTMLTableElement;
         }
     });
+    manager.registerContextToolbar('details', {
+        selector: 'details',
+        content: getDetailsToolbarContent(),
+    });
 
     // Register image decorator listener
-    manager.registerDecoratorType('image', ImageDecorator);
     manager.registerDecoratorType('code', CodeBlockDecorator);
     manager.registerDecoratorType('diagram', DiagramDecorator);