X-Git-Url: http://source.bookstackapp.com/bookstack/blobdiff_plain/fff5bbcee458992443e3732fbcbbbe34f765fcc3..ab7f5def04a667ce4e6a6aff8b51d27b82550f42:/resources/assets/js/pages/page-form.js
diff --git a/resources/assets/js/pages/page-form.js b/resources/assets/js/pages/page-form.js
index c1e6a92df..497dc0212 100644
--- a/resources/assets/js/pages/page-form.js
+++ b/resources/assets/js/pages/page-form.js
@@ -1,16 +1,18 @@
"use strict";
+const Code = require('../code');
+
/**
* Handle pasting images from clipboard.
* @param e - event
* @param editor - editor instance
*/
function editorPaste(e, editor) {
- if (!e.clipboardData) return
+ if (!e.clipboardData) return;
let items = e.clipboardData.items;
if (!items) return;
for (let i = 0; i < items.length; i++) {
- if (items[i].type.indexOf("image") === -1) return
+ if (items[i].type.indexOf("image") === -1) return;
let file = items[i].getAsFile();
let formData = new FormData();
@@ -50,118 +52,284 @@ function editorPaste(e, editor) {
function registerEditorShortcuts(editor) {
// Headers
for (let i = 1; i < 5; i++) {
- editor.addShortcut('meta+' + i, '', ['FormatBlock', false, 'h' + i]);
+ editor.shortcuts.add('meta+' + i, '', ['FormatBlock', false, 'h' + (i+1)]);
}
// Other block shortcuts
- editor.addShortcut('meta+q', '', ['FormatBlock', false, 'blockquote']);
- editor.addShortcut('meta+d', '', ['FormatBlock', false, 'p']);
- editor.addShortcut('meta+e', '', ['FormatBlock', false, 'pre']);
- editor.addShortcut('meta+shift+E', '', ['FormatBlock', false, 'code']);
+ editor.shortcuts.add('meta+5', '', ['FormatBlock', false, 'p']);
+ editor.shortcuts.add('meta+d', '', ['FormatBlock', false, 'p']);
+ editor.shortcuts.add('meta+6', '', ['FormatBlock', false, 'blockquote']);
+ editor.shortcuts.add('meta+q', '', ['FormatBlock', false, 'blockquote']);
+ editor.shortcuts.add('meta+7', '', ['codeeditor', false, 'pre']);
+ editor.shortcuts.add('meta+e', '', ['codeeditor', false, 'pre']);
+ editor.shortcuts.add('meta+8', '', ['FormatBlock', false, 'code']);
+ editor.shortcuts.add('meta+shift+E', '', ['FormatBlock', false, 'code']);
+ // Loop through callout styles
+ editor.shortcuts.add('meta+9', '', function() {
+ let selectedNode = editor.selection.getNode();
+ let formats = ['info', 'success', 'warning', 'danger'];
+
+ if (!selectedNode || selectedNode.className.indexOf('callout') === -1) {
+ editor.formatter.apply('calloutinfo');
+ return;
+ }
+
+ for (let i = 0; i < formats.length; i++) {
+ if (selectedNode.className.indexOf(formats[i]) === -1) continue;
+ let newFormat = (i === formats.length -1) ? formats[0] : formats[i+1];
+ editor.formatter.apply('callout' + newFormat);
+ return;
+ }
+ editor.formatter.apply('p');
+ });
}
-var mceOptions = module.exports = {
- selector: '#html-editor',
- content_css: [
- window.baseUrl('/css/styles.css'),
- window.baseUrl('/libs/material-design-iconic-font/css/material-design-iconic-font.min.css')
- ],
- body_class: 'page-content',
- relative_urls: false,
- remove_script_host: false,
- document_base_url: window.baseUrl('/'),
- statusbar: false,
- menubar: false,
- paste_data_images: false,
- extended_valid_elements: 'pre[*]',
- automatic_uploads: false,
- valid_children: "-div[p|pre|h1|h2|h3|h4|h5|h6|blockquote]",
- plugins: "image table textcolor paste link fullscreen imagetools code customhr autosave lists",
- imagetools_toolbar: 'imageoptions',
- toolbar: "undo redo | styleselect | bold italic underline strikethrough superscript subscript | forecolor backcolor | alignleft aligncenter alignright alignjustify | bullist numlist outdent indent | table image-insert link hr | removeformat code fullscreen",
- content_style: "body {padding-left: 15px !important; padding-right: 15px !important; margin:0!important; margin-left:auto!important;margin-right:auto!important;}",
- style_formats: [
- {title: "Header Large", format: "h2"},
- {title: "Header Medium", format: "h3"},
- {title: "Header Small", format: "h4"},
- {title: "Header Tiny", format: "h5"},
- {title: "Paragraph", format: "p", exact: true, classes: ''},
- {title: "Blockquote", format: "blockquote"},
- {title: "Code Block", icon: "code", format: "pre"},
- {title: "Inline Code", icon: "code", inline: "code"},
- {title: "Callouts", items: [
- {title: "Success", block: 'p', exact: true, attributes : {'class' : 'callout success'}},
- {title: "Info", block: 'p', exact: true, attributes : {'class' : 'callout info'}},
- {title: "Warning", block: 'p', exact: true, attributes : {'class' : 'callout warning'}},
- {title: "Danger", block: 'p', exact: true, attributes : {'class' : 'callout danger'}}
- ]}
- ],
- style_formats_merge: false,
- 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'},
- },
- file_browser_callback: function (field_name, url, type, win) {
-
- if (type === 'file') {
- window.showEntityLinkSelector(function(entity) {
- let originalField = win.document.getElementById(field_name);
- originalField.value = entity.link;
- $(originalField).closest('.mce-form').find('input').eq(2).val(entity.name);
+
+/**
+ * Create and enable our custom code plugin
+ */
+function codePlugin() {
+
+ function elemIsCodeBlock(elem) {
+ return elem.className === 'CodeMirrorContainer';
+ }
+
+ function showPopup(editor) {
+ let selectedNode = editor.selection.getNode();
+
+ if (!elemIsCodeBlock(selectedNode)) {
+ let providedCode = editor.selection.getNode().textContent;
+ window.vues['code-editor'].open(providedCode, '', (code, lang) => {
+ let wrap = document.createElement('div');
+ wrap.innerHTML = `
`;
+ wrap.querySelector('code').innerText = code;
+
+ editor.formatter.toggle('pre');
+ let node = editor.selection.getNode();
+ editor.dom.setHTML(node, wrap.querySelector('pre').innerHTML);
+ editor.fire('SetContent');
});
+ return;
}
- if (type === 'image') {
- // Show image manager
- window.ImageManager.showExternal(function (image) {
-
- // Set popover link input to image url then fire change event
- // to ensure the new value sticks
- win.document.getElementById(field_name).value = image.url;
- if ("createEvent" in document) {
- let evt = document.createEvent("HTMLEvents");
- evt.initEvent("change", false, true);
- win.document.getElementById(field_name).dispatchEvent(evt);
- } else {
- win.document.getElementById(field_name).fireEvent("onchange");
- }
+ let lang = selectedNode.hasAttribute('data-lang') ? selectedNode.getAttribute('data-lang') : '';
+ let currentCode = selectedNode.querySelector('textarea').textContent;
+
+ window.vues['code-editor'].open(currentCode, lang, (code, lang) => {
+ let editorElem = selectedNode.querySelector('.CodeMirror');
+ let cmInstance = editorElem.CodeMirror;
+ if (cmInstance) {
+ Code.setContent(cmInstance, code);
+ Code.setMode(cmInstance, lang);
+ }
+ let textArea = selectedNode.querySelector('textarea');
+ if (textArea) textArea.textContent = code;
+ selectedNode.setAttribute('data-lang', lang);
+ });
+ }
+
+ function codeMirrorContainerToPre($codeMirrorContainer) {
+ let textArea = $codeMirrorContainer[0].querySelector('textarea');
+ let code = textArea.textContent;
+ let lang = $codeMirrorContainer[0].getAttribute('data-lang');
+
+ $codeMirrorContainer.removeAttr('contentEditable');
+ let $pre = $('');
+ $pre.append($('
`;
- html += '';
- win.tinyMCE.activeEditor.execCommand('mceInsertContent', false, html);
+ editor.addCommand('codeeditor', () => {
+ showPopup(editor);
+ });
+
+ // Convert
+ editor.on('PreProcess', function (e) {
+ $('div.CodeMirrorContainer', e.node).
+ each((index, elem) => {
+ let $elem = $(elem);
+ codeMirrorContainerToPre($elem);
});
- }
+ });
- },
- paste_preprocess: function (plugin, args) {
- let content = args.content;
- if (content.indexOf(' !== -1) {
- args.content = '';
- }
- },
- extraSetups: [],
- setup: function (editor) {
-
- // Run additional setup actions
- // Used by the angular side of things
- for (let i = 0; i < mceOptions.extraSetups.length; i++) {
- mceOptions.extraSetups[i](editor);
- }
+ editor.on('dblclick', event => {
+ let selectedNode = editor.selection.getNode();
+ if (!elemIsCodeBlock(selectedNode)) return;
+ showPopup(editor);
+ });
+
+ editor.on('SetContent', function () {
+
+ // Recover broken codemirror instances
+ $('.CodeMirrorContainer').filter((index ,elem) => {
+ return typeof elem.querySelector('.CodeMirror').CodeMirror === 'undefined';
+ }).each((index, elem) => {
+ codeMirrorContainerToPre($(elem));
+ });
+
+ let codeSamples = $('body > pre').filter((index, elem) => {
+ return elem.contentEditable !== )
{
+ Code.wysiwygView(elem);
+ });
+ });
+ });
+
+ });
+}
+
+function hrPlugin() {
+ window.tinymce.PluginManager.add('customhr', function (editor) {
+ editor.addCommand('InsertHorizontalRule', function () {
+ let hrElem = document.createElement('hr');
+ let cNode = editor.selection.getNode();
+ let parentNode = cNode.parentNode;
+ parentNode.insertBefore(hrElem, cNode);
+ });
+
+ editor.addButton('hr', {
+ icon: 'hr',
+ tooltip: 'Horizontal line',
+ cmd: 'InsertHorizontalRule'
+ });
+
+ editor.addMenuItem('hr', {
+ icon: 'hr',
+ text: 'Horizontal line',
+ cmd: 'InsertHorizontalRule',
+ context: 'insert'
+ });
+ });
+}
+
+module.exports = function() {
+ hrPlugin();
+ codePlugin();
+ let settings = {
+ selector: '#html-editor',
+ content_css: [
+ window.baseUrl('/css/styles.css'),
+ window.baseUrl('/libs/material-design-iconic-font/css/material-design-iconic-font.min.css')
+ ],
+ branding: false,
+ body_class: 'page-content',
+ browser_spellcheck: true,
+ relative_urls: false,
+ remove_script_host: false,
+ document_base_url: window.baseUrl('/'),
+ statusbar: false,
+ menubar: false,
+ paste_data_images: false,
+ extended_valid_elements: 'pre[*]',
+ automatic_uploads: false,
+ valid_children: "-div[p|h1|h2|h3|h4|h5|h6|blockquote],+div[pre]",
+ plugins: "image table textcolor paste link autolink fullscreen imagetools code customhr autosave lists codeeditor",
+ imagetools_toolbar: 'imageoptions',
+ toolbar: "undo redo | styleselect | bold italic underline strikethrough superscript subscript | forecolor backcolor | alignleft aligncenter alignright alignjustify | bullist numlist outdent indent | table image-insert link hr | removeformat code fullscreen",
+ content_style: "body {padding-left: 15px !important; padding-right: 15px !important; margin:0!important; margin-left:auto!important;margin-right:auto!important;}",
+ style_formats: [
+ {title: "Header Large", format: "h2"},
+ {title: "Header Medium", format: "h3"},
+ {title: "Header Small", format: "h4"},
+ {title: "Header Tiny", format: "h5"},
+ {title: "Paragraph", format: "p", exact: true, classes: ''},
+ {title: "Blockquote", format: "blockquote"},
+ {title: "Code Block", icon: "code", cmd: 'codeeditor', format: 'codeeditor'},
+ {title: "Inline Code", icon: "code", inline: "code"},
+ {title: "Callouts", items: [
+ {title: "Info", format: 'calloutinfo'},
+ {title: "Success", format: 'calloutsuccess'},
+ {title: "Warning", format: 'calloutwarning'},
+ {title: "Danger", format: 'calloutdanger'}
+ ]},
+ ],
+ style_formats_merge: false,
+ formats: {
+ codeeditor: {selector: 'p,h1,h2,h3,h4,h5,h6,td,th,div'},
+ 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'},
+ 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'}},
+ calloutdanger: {block: 'p', exact: true, attributes: {class: 'callout danger'}}
+ },
+ file_browser_callback: function (field_name, url, type, win) {
+
+ if (type === 'file') {
+ window.EntitySelectorPopup.show(function(entity) {
+ let originalField = win.document.getElementById(field_name);
+ originalField.value = entity.link;
+ $(originalField).closest('.mce-form').find('input').eq(2).val(entity.name);
+ });
+ }
+
+ if (type === 'image') {
+ // Show image manager
+ window.ImageManager.show(function (image) {
+
+ // Set popover link input to image url then fire change event
+ // to ensure the new value sticks
+ win.document.getElementById(field_name).value = image.url;
+ if ("createEvent" in document) {
+ let evt = document.createEvent("HTMLEvents");
+ evt.initEvent("change", false, true);
+ win.document.getElementById(field_name).dispatchEvent(evt);
+ } else {
+ win.document.getElementById(field_name).fireEvent("onchange");
+ }
+
+ // Replace the actively selected content with the linked image
+ let html = ``;
+ html += ``;
+ html += '';
+ win.tinyMCE.activeEditor.execCommand('mceInsertContent', false, html);
+ });
+ }
+
+ },
+ paste_preprocess: function (plugin, args) {
+ let content = args.content;
+ if (content.indexOf(' !== -1) {
+ args.content = '';
+ }
+ },
+ extraSetups: [],
+ setup: function (editor) {
+
+ // Run additional setup actions
+ // Used by the angular side of things
+ for (let i = 0; i < settings.extraSetups.length; i++) {
+ settings.extraSetups[i](editor);
+ }
- registerEditorShortcuts(editor);
+ registerEditorShortcuts(editor);
- (function () {
- var wrap;
+ let wrap;
function hasTextContent(node) {
return node && !!( node.textContent || node.innerText );
}
editor.on('dragstart', function () {
- var node = editor.selection.getNode();
+ let node = editor.selection.getNode();
if (node.nodeName !== 'IMG') return;
wrap = editor.dom.getParent(node, '.mceTemp');
@@ -172,7 +340,7 @@ var mceOptions = module.exports = {
});
editor.on('drop', function (event) {
- var dom = editor.dom,
+ let dom = editor.dom,
rng = tinymce.dom.RangeUtils.getCaretRangeFromPoint(event.clientX, event.clientY, editor.getDoc());
// Don't allow anything to be dropped in a captioned image.
@@ -190,26 +358,27 @@ var mceOptions = module.exports = {
wrap = null;
});
- })();
-
- // Custom Image picker button
- editor.addButton('image-insert', {
- title: 'My title',
- icon: 'image',
- tooltip: 'Insert an image',
- onclick: function () {
- window.ImageManager.showExternal(function (image) {
- let html = `<a href=)
`;
- html += ``;
- html += '';
- editor.execCommand('mceInsertContent', false, html);
- });
- }
- });
- // Paste image-uploads
- editor.on('paste', function(event) {
- editorPaste(event, editor);
- });
- }
+ // Custom Image picker button
+ editor.addButton('image-insert', {
+ title: 'My title',
+ icon: 'image',
+ tooltip: 'Insert an image',
+ onclick: function () {
+ window.ImageManager.show(function (image) {
+ let html = ``;
+ html += ``;
+ html += '';
+ editor.execCommand('mceInsertContent', false, html);
+ });
+ }
+ });
+
+ // Paste image-uploads
+ editor.on('paste', function(event) {
+ editorPaste(event, editor);
+ });
+ }
+ };
+ return settings;
};
\ No newline at end of file