Audit Log: Fixed bad reference to linked entity item

[bookstack] / resources / js / wysiwyg / config.js

diff --git a/resources/js/wysiwyg/config.js b/resources/js/wysiwyg/config.js
index 984081bd602f2c7efc1ae3c175008a9bec3b63da..1666aa50066af25f3ab38b12a996cce2148672bb 100644 (file)
--- a/resources/js/wysiwyg/config.js
+++ b/resources/js/wysiwyg/config.js
@@ -12,7 +12,13 @@ import {getPlugin as getCustomhrPlugin} from './plugins-customhr';
 import {getPlugin as getImagemanagerPlugin} from './plugins-imagemanager';
 import {getPlugin as getAboutPlugin} from './plugins-about';
 import {getPlugin as getDetailsPlugin} from './plugins-details';
 import {getPlugin as getImagemanagerPlugin} from './plugins-imagemanager';
 import {getPlugin as getAboutPlugin} from './plugins-about';
 import {getPlugin as getDetailsPlugin} from './plugins-details';

+import {getPlugin as getTableAdditionsPlugin} from './plugins-table-additions';

 import {getPlugin as getTasklistPlugin} from './plugins-tasklist';
 import {getPlugin as getTasklistPlugin} from './plugins-tasklist';

+import {
+    handleTableCellRangeEvents,
+    handleEmbedAlignmentChanges,
+    handleTextDirectionCleaning,
+} from './fixes';

 
 const styleFormats = [
     {title: 'Large Header', format: 'h2', preview: 'color: blue;'},
 
 const styleFormats = [
     {title: 'Large Header', format: 'h2', preview: 'color: blue;'},


@@ -35,9 +41,9 @@ const styleFormats = [
 ];
 
 const formats = {
 ];
 
 const formats = {

-    alignleft: {selector: 'p,h1,h2,h3,h4,h5,h6,td,th,div,ul,ol,li,table,img', classes: 'align-left'},
-    aligncenter: {selector: 'p,h1,h2,h3,h4,h5,h6,td,th,div,ul,ol,li,table,img', classes: 'align-center'},
-    alignright: {selector: 'p,h1,h2,h3,h4,h5,h6,td,th,div,ul,ol,li,table,img', classes: 'align-right'},
+    alignleft: {selector: 'p,h1,h2,h3,h4,h5,h6,td,th,div,ul,ol,li,table,img,iframe,video', classes: 'align-left'},
+    aligncenter: {selector: 'p,h1,h2,h3,h4,h5,h6,td,th,div,ul,ol,li,table,img,iframe,video', classes: 'align-center'},
+    alignright: {selector: 'p,h1,h2,h3,h4,h5,h6,td,th,div,ul,ol,li,table,img,iframe,video', classes: 'align-right'},

     calloutsuccess: {block: 'p', exact: true, attributes: {class: 'callout success'}},
     calloutinfo: {block: 'p', exact: true, attributes: {class: 'callout info'}},
     calloutwarning: {block: 'p', exact: true, attributes: {class: 'callout warning'}},
     calloutsuccess: {block: 'p', exact: true, attributes: {class: 'callout success'}},
     calloutinfo: {block: 'p', exact: true, attributes: {class: 'callout info'}},
     calloutwarning: {block: 'p', exact: true, attributes: {class: 'callout warning'}},


@@ -84,7 +90,12 @@ function filePickerCallback(callback, value, meta) {
                 text: entity.name,
                 title: entity.name,
             });
                 text: entity.name,
                 title: entity.name,
             });

-        }, selectionText);
+        }, {
+            initialValue: selectionText,
+            searchEndpoint: '/search/entity-selector',
+            entityTypes: 'page,book,chapter,bookshelf',
+            entityPermission: 'view',
+        });

     }
 
     if (meta.filetype === 'image') {
     }
 
     if (meta.filetype === 'image') {


@@ -118,6 +129,7 @@ function gatherPlugins(options) {
         'about',
         'details',
         'tasklist',
         'about',
         'details',
         'tasklist',

+        'tableadditions',

         options.textDirection === 'rtl' ? 'directionality' : '',
     ];
 
         options.textDirection === 'rtl' ? 'directionality' : '',
     ];
 


@@ -127,6 +139,7 @@ function gatherPlugins(options) {
     window.tinymce.PluginManager.add('about', getAboutPlugin());
     window.tinymce.PluginManager.add('details', getDetailsPlugin());
     window.tinymce.PluginManager.add('tasklist', getTasklistPlugin());
     window.tinymce.PluginManager.add('about', getAboutPlugin());
     window.tinymce.PluginManager.add('details', getDetailsPlugin());
     window.tinymce.PluginManager.add('tasklist', getTasklistPlugin());

+    window.tinymce.PluginManager.add('tableadditions', getTableAdditionsPlugin());

 
     if (options.drawioUrl) {
         window.tinymce.PluginManager.add('drawio', getDrawioPlugin(options));
 
     if (options.drawioUrl) {
         window.tinymce.PluginManager.add('drawio', getDrawioPlugin(options));


@@ -137,16 +150,23 @@ function gatherPlugins(options) {
 }
 
 /**
 }
 
 /**

- * Fetch custom HTML head content from the parent page head into the editor.
+ * Fetch custom HTML head content nodes from the outer page head
+ * and add them to the given editor document.
+ * @param {Document} editorDoc

  */
  */

-function fetchCustomHeadContent() {
+function addCustomHeadContent(editorDoc) {

     const headContentLines = document.head.innerHTML.split('\n');
     const startLineIndex = headContentLines.findIndex(line => line.trim() === '<!-- Start: custom user content -->');
     const endLineIndex = headContentLines.findIndex(line => line.trim() === '<!-- End: custom user content -->');
     if (startLineIndex === -1 || endLineIndex === -1) {
     const headContentLines = document.head.innerHTML.split('\n');
     const startLineIndex = headContentLines.findIndex(line => line.trim() === '<!-- Start: custom user content -->');
     const endLineIndex = headContentLines.findIndex(line => line.trim() === '<!-- End: custom user content -->');
     if (startLineIndex === -1 || endLineIndex === -1) {

-        return '';
+        return;

     }
     }

-    return headContentLines.slice(startLineIndex + 1, endLineIndex).join('\n');
+
+    const customHeadHtml = headContentLines.slice(startLineIndex + 1, endLineIndex).join('\n');
+    const el = editorDoc.createElement('div');
+    el.innerHTML = customHeadHtml;
+
+    editorDoc.head.append(...el.children);

 }
 
 /**
 }
 
 /**


@@ -177,6 +197,10 @@ function getSetupCallback(options) {
             setupFilters(editor);
         });
 
             setupFilters(editor);
         });
 

+        handleEmbedAlignmentChanges(editor);
+        handleTableCellRangeEvents(editor);
+        handleTextDirectionCleaning(editor);
+

         // Custom handler hook
         window.$events.emitPublic(options.containerElement, 'editor-tinymce::setup', {editor});
 
         // Custom handler hook
         window.$events.emitPublic(options.containerElement, 'editor-tinymce::setup', {editor});
 


@@ -214,7 +238,7 @@ body {
  * @param {WysiwygConfigOptions} options
  * @return {Object}
  */
  * @param {WysiwygConfigOptions} options
  * @return {Object}
  */

-export function build(options) {
+export function buildForEditor(options) {

     // Set language
     window.tinymce.addI18n(options.language, options.translationMap);
 
     // Set language
     window.tinymce.addI18n(options.language, options.translationMap);
 


@@ -276,8 +300,7 @@ export function build(options) {
             }
         },
         init_instance_callback(editor) {
             }
         },
         init_instance_callback(editor) {

-            const head = editor.getDoc().querySelector('head');
-            head.innerHTML += fetchCustomHeadContent();
+            addCustomHeadContent(editor.getDoc());

         },
         setup(editor) {
             registerCustomIcons(editor);
         },
         setup(editor) {
             registerCustomIcons(editor);


@@ -287,6 +310,54 @@ export function build(options) {
     };
 }
 
     };
 }
 

+/**
+ * @param {WysiwygConfigOptions} options
+ * @return {RawEditorOptions}
+ */
+export function buildForInput(options) {
+    // Set language
+    window.tinymce.addI18n(options.language, options.translationMap);
+
+    // BookStack Version
+    const version = document.querySelector('script[src*="/dist/app.js"]').getAttribute('src').split('?version=')[1];
+
+    // Return config object
+    return {
+        width: '100%',
+        height: '185px',
+        target: options.containerElement,
+        cache_suffix: `?version=${version}`,
+        content_css: [
+            window.baseUrl('/dist/styles.css'),
+        ],
+        branding: false,
+        skin: options.darkMode ? 'tinymce-5-dark' : 'tinymce-5',
+        body_class: 'wysiwyg-input',
+        browser_spellcheck: true,
+        relative_urls: false,
+        language: options.language,
+        directionality: options.textDirection,
+        remove_script_host: false,
+        document_base_url: window.baseUrl('/'),
+        end_container_on_empty_block: true,
+        remove_trailing_brs: false,
+        statusbar: false,
+        menubar: false,
+        plugins: 'link autolink lists',
+        contextmenu: false,
+        toolbar: 'bold italic link bullist numlist',
+        content_style: getContentStyle(options),
+        file_picker_types: 'file',
+        valid_elements: 'p,a[href|title|target],ol,ul,li,strong,em,br',
+        file_picker_callback: filePickerCallback,
+        init_instance_callback(editor) {
+            addCustomHeadContent(editor.getDoc());
+
+            editor.contentDocument.documentElement.classList.toggle('dark-mode', options.darkMode);
+        },
+    };
+}
+

 /**
  * @typedef {Object} WysiwygConfigOptions
  * @property {Element} containerElement
 /**
  * @typedef {Object} WysiwygConfigOptions
  * @property {Element} containerElement