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 fa2df9c11721277bab2ed7770d1d6a0787b3fada..1666aa50066af25f3ab38b12a996cce2148672bb 100644 (file)
--- a/resources/js/wysiwyg/config.js
+++ b/resources/js/wysiwyg/config.js
@@ -12,8 +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 {handleEmbedAlignmentChanges} from './fixes';
+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;'},


@@ -36,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,iframe,video,span', classes: 'align-left'},
-    aligncenter: {selector: 'p,h1,h2,h3,h4,h5,h6,td,th,div,ul,ol,li,table,img,iframe,video,span', classes: 'align-center'},
-    alignright: {selector: 'p,h1,h2,h3,h4,h5,h6,td,th,div,ul,ol,li,table,img,iframe,video,span', 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'}},


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

+        'tableadditions',

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


@@ -133,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));


@@ -191,6 +198,8 @@ function getSetupCallback(options) {
         });
 
         handleEmbedAlignmentChanges(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});


@@ -339,7 +348,7 @@ export function buildForInput(options) {
         toolbar: 'bold italic link bullist numlist',
         content_style: getContentStyle(options),
         file_picker_types: 'file',
         toolbar: 'bold italic link bullist numlist',
         content_style: getContentStyle(options),
         file_picker_types: 'file',

-        valid_elements: 'p,a[href|title],ol,ul,li,strong,em,br',
+        valid_elements: 'p,a[href|title|target],ol,ul,li,strong,em,br',

         file_picker_callback: filePickerCallback,
         init_instance_callback(editor) {
             addCustomHeadContent(editor.getDoc());
         file_picker_callback: filePickerCallback,
         init_instance_callback(editor) {
             addCustomHeadContent(editor.getDoc());