X-Git-Url: http://source.bookstackapp.com/bookstack/blobdiff_plain/c519f707e82693cfe6d392c04dd8e2efaeca24ca..refs/pull/3616/head:/resources/js/wysiwyg/config.js diff --git a/resources/js/wysiwyg/config.js b/resources/js/wysiwyg/config.js index 6218b2e41..52c52592c 100644 --- a/resources/js/wysiwyg/config.js +++ b/resources/js/wysiwyg/config.js @@ -39,6 +39,35 @@ const formats = { calloutdanger: {block: 'p', exact: true, attributes: {class: 'callout danger'}} }; +const color_map = [ + '#BFEDD2', '', + '#FBEEB8', '', + '#F8CAC6', '', + '#ECCAFA', '', + '#C2E0F4', '', + + '#2DC26B', '', + '#F1C40F', '', + '#E03E2D', '', + '#B96AD9', '', + '#3598DB', '', + + '#169179', '', + '#E67E23', '', + '#BA372A', '', + '#843FA1', '', + '#236FA1', '', + + '#ECF0F1', '', + '#CED4D9', '', + '#95A5A6', '', + '#7E8C8D', '', + '#34495E', '', + + '#000000', '', + '#ffffff', '' +]; + function file_picker_callback(callback, value, meta) { // field_name, url, type, win @@ -121,7 +150,7 @@ function setupBrFilter(editor) { editor.serializer.addNodeFilter('br', function(nodes) { for (const node of nodes) { if (node.parent && node.parent.name === 'code') { - const newline = new tinymce.html.Node.create('#text'); + const newline = tinymce.html.Node.create('#text'); newline.value = '\n'; node.replace(newline); } @@ -137,13 +166,13 @@ function getSetupCallback(options) { return function(editor) { editor.on('ExecCommand change input NodeChange ObjectResized', editorChange); listenForCommonEvents(editor); - registerShortcuts(editor); listenForDragAndPaste(editor, options); editor.on('init', () => { editorChange(); scrollToQueryString(editor); window.editor = editor; + registerShortcuts(editor); }); editor.on('PreInit', () => { @@ -235,7 +264,7 @@ export function build(options) { "-doc-root[doc-root|#text]", "-li[details]", "+code-block[pre]", - "+doc-root[code-block]" + "+doc-root[p|h1|h2|h3|h4|h5|h6|blockquote|code-block|div]" ].join(','), plugins: gatherPlugins(options), contextmenu: false, @@ -246,9 +275,10 @@ export function build(options) { media_alt_source: false, media_poster: false, formats, - table_style_by_css: false, - table_use_colgroups: false, + table_style_by_css: true, + table_use_colgroups: true, file_picker_types: 'file image', + color_map, file_picker_callback, paste_preprocess(plugin, args) { const content = args.content;