'sidebar': require('./sidebar'),
'page-picker': require('./page-picker'),
'page-comments': require('./page-comments'),
+ 'wysiwyg-editor': require('./wysiwyg-editor'),
+ 'markdown-editor': require('./markdown-editor'),
};
window.components = {};
--- /dev/null
+const MarkdownIt = require("markdown-it");
+const mdTasksLists = require('markdown-it-task-lists');
+const code = require('../code');
+
+class MarkdownEditor {
+
+ constructor(elem) {
+ this.elem = elem;
+ this.markdown = new MarkdownIt({html: true});
+ this.markdown.use(mdTasksLists, {label: true});
+
+ this.display = this.elem.querySelector('.markdown-display');
+ this.input = this.elem.querySelector('textarea');
+ this.htmlInput = this.elem.querySelector('input[name=html]');
+ this.cm = code.markdownEditor(this.input);
+
+ this.onMarkdownScroll = this.onMarkdownScroll.bind(this);
+ this.init();
+ }
+
+ init() {
+
+ // Prevent markdown display link click redirect
+ this.display.addEventListener('click', event => {
+ let link = event.target.closest('a');
+ if (link === null) return;
+
+ event.preventDefault();
+ window.open(link.getAttribute('href'));
+ });
+
+ // Button actions
+ this.elem.addEventListener('click', event => {
+ let button = event.target.closest('button[data-action]');
+ if (button === null) return;
+
+ let action = button.getAttribute('data-action');
+ if (action === 'insertImage') this.actionInsertImage();
+ if (action === 'insertLink') this.actionShowLinkSelector();
+ });
+
+ window.$events.listen('editor-markdown-update', value => {
+ this.cm.setValue(value);
+ this.updateAndRender();
+ });
+
+ this.codeMirrorSetup();
+ }
+
+ // Update the input content and render the display.
+ updateAndRender() {
+ let content = this.cm.getValue();
+ this.input.value = content;
+ let html = this.markdown.render(content);
+ window.$events.emit('editor-html-change', html);
+ window.$events.emit('editor-markdown-change', content);
+ this.display.innerHTML = html;
+ this.htmlInput.value = html;
+ }
+
+ onMarkdownScroll(lineCount) {
+ let elems = this.display.children;
+ if (elems.length <= lineCount) return;
+
+ let topElem = (lineCount === -1) ? elems[elems.length-1] : elems[lineCount];
+ // TODO - Replace jQuery
+ $(this.display).animate({
+ scrollTop: topElem.offsetTop
+ }, {queue: false, duration: 200, easing: 'linear'});
+ }
+
+ codeMirrorSetup() {
+ let cm = this.cm;
+ // Custom key commands
+ let metaKey = code.getMetaKey();
+ const extraKeys = {};
+ // Insert Image shortcut
+ extraKeys[`${metaKey}-Alt-I`] = function(cm) {
+ let selectedText = cm.getSelection();
+ let newText = ``;
+ let cursorPos = cm.getCursor('from');
+ cm.replaceSelection(newText);
+ cm.setCursor(cursorPos.line, cursorPos.ch + newText.length -1);
+ };
+ // Save draft
+ extraKeys[`${metaKey}-S`] = cm => {window.$events.emit('editor-save-draft')};
+ // Show link selector
+ extraKeys[`Shift-${metaKey}-K`] = cm => {this.actionShowLinkSelector()};
+ // Insert Link
+ extraKeys[`${metaKey}-K`] = cm => {insertLink()};
+ // FormatShortcuts
+ extraKeys[`${metaKey}-1`] = cm => {replaceLineStart('##');};
+ extraKeys[`${metaKey}-2`] = cm => {replaceLineStart('###');};
+ extraKeys[`${metaKey}-3`] = cm => {replaceLineStart('####');};
+ extraKeys[`${metaKey}-4`] = cm => {replaceLineStart('#####');};
+ extraKeys[`${metaKey}-5`] = cm => {replaceLineStart('');};
+ extraKeys[`${metaKey}-d`] = cm => {replaceLineStart('');};
+ extraKeys[`${metaKey}-6`] = cm => {replaceLineStart('>');};
+ extraKeys[`${metaKey}-q`] = cm => {replaceLineStart('>');};
+ extraKeys[`${metaKey}-7`] = cm => {wrapSelection('\n```\n', '\n```');};
+ extraKeys[`${metaKey}-8`] = cm => {wrapSelection('`', '`');};
+ extraKeys[`Shift-${metaKey}-E`] = cm => {wrapSelection('`', '`');};
+ extraKeys[`${metaKey}-9`] = cm => {wrapSelection('<p class="callout info">', '</p>');};
+ cm.setOption('extraKeys', extraKeys);
+
+ // Update data on content change
+ cm.on('change', (instance, changeObj) => {
+ this.updateAndRender();
+ });
+
+ // Handle scroll to sync display view
+ cm.on('scroll', instance => {
+ // Thanks to http://liuhao.im/english/2015/11/10/the-sync-scroll-of-markdown-editor-in-javascript.html
+ let scroll = instance.getScrollInfo();
+ let atEnd = scroll.top + scroll.clientHeight === scroll.height;
+ if (atEnd) {
+ this.onMarkdownScroll(-1);
+ return;
+ }
+
+ let lineNum = instance.lineAtHeight(scroll.top, 'local');
+ let range = instance.getRange({line: 0, ch: null}, {line: lineNum, ch: null});
+ let parser = new DOMParser();
+ let doc = parser.parseFromString(this.markdown.render(range), 'text/html');
+ let totalLines = doc.documentElement.querySelectorAll('body > *');
+ this.onMarkdownScroll(totalLines.length);
+ });
+
+ // Handle image paste
+ cm.on('paste', (cm, event) => {
+ if (!event.clipboardData || !event.clipboardData.items) return;
+ for (let i = 0; i < event.clipboardData.items.length; i++) {
+ uploadImage(event.clipboardData.items[i].getAsFile());
+ }
+ });
+
+ // Handle images on drag-drop
+ cm.on('drop', (cm, event) => {
+ event.stopPropagation();
+ event.preventDefault();
+ let cursorPos = cm.coordsChar({left: event.pageX, top: event.pageY});
+ cm.setCursor(cursorPos);
+ if (!event.dataTransfer || !event.dataTransfer.files) return;
+ for (let i = 0; i < event.dataTransfer.files.length; i++) {
+ uploadImage(event.dataTransfer.files[i]);
+ }
+ });
+
+ // Helper to replace editor content
+ function replaceContent(search, replace) {
+ let text = cm.getValue();
+ let cursor = cm.listSelections();
+ cm.setValue(text.replace(search, replace));
+ cm.setSelections(cursor);
+ }
+
+ // Helper to replace the start of the line
+ function replaceLineStart(newStart) {
+ let cursor = cm.getCursor();
+ let lineContent = cm.getLine(cursor.line);
+ let lineLen = lineContent.length;
+ let lineStart = lineContent.split(' ')[0];
+
+ // Remove symbol if already set
+ if (lineStart === newStart) {
+ lineContent = lineContent.replace(`${newStart} `, '');
+ cm.replaceRange(lineContent, {line: cursor.line, ch: 0}, {line: cursor.line, ch: lineLen});
+ cm.setCursor({line: cursor.line, ch: cursor.ch - (newStart.length + 1)});
+ return;
+ }
+
+ let alreadySymbol = /^[#>`]/.test(lineStart);
+ let posDif = 0;
+ if (alreadySymbol) {
+ posDif = newStart.length - lineStart.length;
+ lineContent = lineContent.replace(lineStart, newStart).trim();
+ } else if (newStart !== '') {
+ posDif = newStart.length + 1;
+ lineContent = newStart + ' ' + lineContent;
+ }
+ cm.replaceRange(lineContent, {line: cursor.line, ch: 0}, {line: cursor.line, ch: lineLen});
+ cm.setCursor({line: cursor.line, ch: cursor.ch + posDif});
+ }
+
+ function wrapLine(start, end) {
+ let cursor = cm.getCursor();
+ let lineContent = cm.getLine(cursor.line);
+ let lineLen = lineContent.length;
+ let newLineContent = lineContent;
+
+ if (lineContent.indexOf(start) === 0 && lineContent.slice(-end.length) === end) {
+ newLineContent = lineContent.slice(start.length, lineContent.length - end.length);
+ } else {
+ newLineContent = `${start}${lineContent}${end}`;
+ }
+
+ cm.replaceRange(newLineContent, {line: cursor.line, ch: 0}, {line: cursor.line, ch: lineLen});
+ cm.setCursor({line: cursor.line, ch: cursor.ch + start.length});
+ }
+
+ function wrapSelection(start, end) {
+ let selection = cm.getSelection();
+ if (selection === '') return wrapLine(start, end);
+
+ let newSelection = selection;
+ let frontDiff = 0;
+ let endDiff = 0;
+
+ if (selection.indexOf(start) === 0 && selection.slice(-end.length) === end) {
+ newSelection = selection.slice(start.length, selection.length - end.length);
+ endDiff = -(end.length + start.length);
+ } else {
+ newSelection = `${start}${selection}${end}`;
+ endDiff = start.length + end.length;
+ }
+
+ let selections = cm.listSelections()[0];
+ cm.replaceSelection(newSelection);
+ let headFirst = selections.head.ch <= selections.anchor.ch;
+ selections.head.ch += headFirst ? frontDiff : endDiff;
+ selections.anchor.ch += headFirst ? endDiff : frontDiff;
+ cm.setSelections([selections]);
+ }
+
+ // Handle image upload and add image into markdown content
+ function uploadImage(file) {
+ if (file === null || file.type.indexOf('image') !== 0) return;
+ let ext = 'png';
+
+ if (file.name) {
+ let fileNameMatches = file.name.match(/\.(.+)$/);
+ if (fileNameMatches.length > 1) ext = fileNameMatches[1];
+ }
+
+ // Insert image into markdown
+ let id = "image-" + Math.random().toString(16).slice(2);
+ let placeholderImage = window.baseUrl(`/loading.gif#upload${id}`);
+ let selectedText = cm.getSelection();
+ let placeHolderText = ``;
+ cm.replaceSelection(placeHolderText);
+
+ let remoteFilename = "image-" + Date.now() + "." + ext;
+ let formData = new FormData();
+ formData.append('file', file, remoteFilename);
+
+ window.$http.post('/images/gallery/upload', formData).then(resp => {
+ replaceContent(placeholderImage, resp.data.thumbs.display);
+ }).catch(err => {
+ events.emit('error', trans('errors.image_upload_error'));
+ replaceContent(placeHolderText, selectedText);
+ console.log(err);
+ });
+ }
+
+ function insertLink() {
+ let cursorPos = cm.getCursor('from');
+ let selectedText = cm.getSelection() || '';
+ let newText = `[${selectedText}]()`;
+ cm.focus();
+ cm.replaceSelection(newText);
+ let cursorPosDiff = (selectedText === '') ? -3 : -1;
+ cm.setCursor(cursorPos.line, cursorPos.ch + newText.length+cursorPosDiff);
+ }
+
+ this.updateAndRender();
+ }
+
+ actionInsertImage() {
+ let cursorPos = this.cm.getCursor('from');
+ window.ImageManager.show(image => {
+ let selectedText = this.cm.getSelection();
+ let newText = "![" + (selectedText || image.name) + "](" + image.thumbs.display + ")";
+ this.cm.focus();
+ this.cm.replaceSelection(newText);
+ this.cm.setCursor(cursorPos.line, cursorPos.ch + newText.length);
+ });
+ }
+
+ // Show the popup link selector and insert a link when finished
+ actionShowLinkSelector() {
+ let cursorPos = this.cm.getCursor('from');
+ window.EntitySelectorPopup.show(entity => {
+ let selectedText = this.cm.getSelection() || entity.name;
+ let newText = `[${selectedText}](${entity.link})`;
+ this.cm.focus();
+ this.cm.replaceSelection(newText);
+ this.cm.setCursor(cursorPos.line, cursorPos.ch + newText.length);
+ });
+ }
+
+}
+
+module.exports = MarkdownEditor ;
\ No newline at end of file
--- /dev/null
+class WysiwygEditor {
+
+ constructor(elem) {
+ this.elem = elem;
+ this.options = require("../pages/page-form");
+ tinymce.init(this.options);
+ }
+
+}
+
+module.exports = WysiwygEditor;
\ No newline at end of file
const moment = require('moment');
require('moment/locale/en-gb');
-const editorOptions = require("./pages/page-form");
moment.locale('en-gb');
ngApp.controller('PageEditController', ['$scope', '$http', '$attrs', '$interval', '$timeout', '$sce',
function ($scope, $http, $attrs, $interval, $timeout, $sce) {
- $scope.editorOptions = editorOptions();
- $scope.editContent = '';
+ $scope.editorHTML = '';
+ $scope.editorMarkdown = '';
+
$scope.draftText = '';
let pageId = Number($attrs.pageId);
let isEdit = pageId !== 0;
}, 1000);
}
- // Actions specifically for the markdown editor
- if (isMarkdown) {
- $scope.displayContent = '';
- // Editor change event
- $scope.editorChange = function (content) {
- $scope.displayContent = $sce.trustAsHtml(content);
- }
- }
-
- if (!isMarkdown) {
- $scope.editorChange = function() {};
- }
-
let lastSave = 0;
/**
*/
function startAutoSave() {
currentContent.title = $('#name').val();
- currentContent.html = $scope.editContent;
+ currentContent.html = $scope.editorHTML;
autoSave = $interval(() => {
// Return if manually saved recently to prevent bombarding the server
if (Date.now() - lastSave < (1000*autosaveFrequency)/2) return;
let newTitle = $('#name').val();
- let newHtml = $scope.editContent;
+ let newHtml = $scope.editorHTML;
if (newTitle !== currentContent.title || newHtml !== currentContent.html) {
currentContent.html = newHtml;
*/
function saveDraft() {
if (!$scope.draftsEnabled) return;
+
let data = {
name: $('#name').val(),
- html: isMarkdown ? $sce.getTrustedHtml($scope.displayContent) : $scope.editContent
+ html: $scope.editorHTML
};
-
- if (isMarkdown) data.markdown = $scope.editContent;
+ if (isMarkdown) data.markdown = $scope.editorMarkdown;
let url = window.baseUrl('/ajax/page/' + pageId + '/save-draft');
$http.put(url, data).then(responseData => {
};
// Listen to save draft events from editor
- $scope.$on('save-draft', saveDraft);
+ window.$events.listen('editor-save-draft', saveDraft);
+
+ // Listen to content changes from the editor
+ window.$events.listen('editor-html-change', html => {
+ $scope.editorHTML = html;
+ });
+ window.$events.listen('editor-markdown-change', markdown => {
+ $scope.editorMarkdown = markdown;
+ });
/**
* Discard the current draft and grab the current page
let url = window.baseUrl('/ajax/page/' + pageId);
$http.get(url).then(responseData => {
if (autoSave) $interval.cancel(autoSave);
+
$scope.draftText = trans('entities.pages_editing_page');
$scope.isUpdateDraft = false;
- $scope.$broadcast('html-update', responseData.data.html);
- $scope.$broadcast('markdown-update', responseData.data.markdown || responseData.data.html);
+ window.$events.emit('editor-html-update', responseData.data.html);
+ window.$events.emit('editor-markdown-update', responseData.data.markdown || responseData.data.html);
+
$('#name').val(responseData.data.name);
$timeout(() => {
startAutoSave();
-"use strict";
-const MarkdownIt = require("markdown-it");
-const mdTasksLists = require('markdown-it-task-lists');
-const code = require('./code');
-module.exports = function (ngApp, events) {
-
- /**
- * TinyMCE
- * An angular wrapper around the tinyMCE editor.
- */
- ngApp.directive('tinymce', ['$timeout', function ($timeout) {
- return {
- restrict: 'A',
- scope: {
- tinymce: '=',
- mceModel: '=',
- mceChange: '='
- },
- link: function (scope, element, attrs) {
-
- function tinyMceSetup(editor) {
- editor.on('ExecCommand change input NodeChange ObjectResized', (e) => {
- let content = editor.getContent();
- $timeout(() => {
- scope.mceModel = content;
- });
- scope.mceChange(content);
- });
-
- editor.on('keydown', (event) => {
- if (event.keyCode === 83 && (navigator.platform.match("Mac") ? event.metaKey : event.ctrlKey)) {
- event.preventDefault();
- scope.$emit('save-draft', event);
- }
- });
-
- editor.on('init', (e) => {
- scope.mceModel = editor.getContent();
- });
-
- scope.$on('html-update', (event, value) => {
- editor.setContent(value);
- editor.selection.select(editor.getBody(), true);
- editor.selection.collapse(false);
- scope.mceModel = editor.getContent();
- });
- }
-
- scope.tinymce.extraSetups.push(tinyMceSetup);
- tinymce.init(scope.tinymce);
- }
- }
- }]);
-
- const md = new MarkdownIt({html: true});
- md.use(mdTasksLists, {label: true});
-
- /**
- * Markdown input
- * Handles the logic for just the editor input field.
- */
- ngApp.directive('markdownInput', ['$timeout', function ($timeout) {
- return {
- restrict: 'A',
- scope: {
- mdModel: '=',
- mdChange: '='
- },
- link: function (scope, element, attrs) {
-
- // Codemirror Setup
- element = element.find('textarea').first();
- let cm = code.markdownEditor(element[0]);
-
- // Custom key commands
- let metaKey = code.getMetaKey();
- const extraKeys = {};
- // Insert Image shortcut
- extraKeys[`${metaKey}-Alt-I`] = function(cm) {
- let selectedText = cm.getSelection();
- let newText = ``;
- let cursorPos = cm.getCursor('from');
- cm.replaceSelection(newText);
- cm.setCursor(cursorPos.line, cursorPos.ch + newText.length -1);
- };
- // Save draft
- extraKeys[`${metaKey}-S`] = function(cm) {scope.$emit('save-draft');};
- // Show link selector
- extraKeys[`Shift-${metaKey}-K`] = function(cm) {showLinkSelector()};
- // Insert Link
- extraKeys[`${metaKey}-K`] = function(cm) {insertLink()};
- // FormatShortcuts
- extraKeys[`${metaKey}-1`] = function(cm) {replaceLineStart('##');};
- extraKeys[`${metaKey}-2`] = function(cm) {replaceLineStart('###');};
- extraKeys[`${metaKey}-3`] = function(cm) {replaceLineStart('####');};
- extraKeys[`${metaKey}-4`] = function(cm) {replaceLineStart('#####');};
- extraKeys[`${metaKey}-5`] = function(cm) {replaceLineStart('');};
- extraKeys[`${metaKey}-d`] = function(cm) {replaceLineStart('');};
- extraKeys[`${metaKey}-6`] = function(cm) {replaceLineStart('>');};
- extraKeys[`${metaKey}-q`] = function(cm) {replaceLineStart('>');};
- extraKeys[`${metaKey}-7`] = function(cm) {wrapSelection('\n```\n', '\n```');};
- extraKeys[`${metaKey}-8`] = function(cm) {wrapSelection('`', '`');};
- extraKeys[`Shift-${metaKey}-E`] = function(cm) {wrapSelection('`', '`');};
- extraKeys[`${metaKey}-9`] = function(cm) {wrapSelection('<p class="callout info">', '</p>');};
- cm.setOption('extraKeys', extraKeys);
-
- // Update data on content change
- cm.on('change', (instance, changeObj) => {
- update(instance);
- });
-
- // Handle scroll to sync display view
- cm.on('scroll', instance => {
- // Thanks to http://liuhao.im/english/2015/11/10/the-sync-scroll-of-markdown-editor-in-javascript.html
- let scroll = instance.getScrollInfo();
- let atEnd = scroll.top + scroll.clientHeight === scroll.height;
- if (atEnd) {
- scope.$emit('markdown-scroll', -1);
- return;
- }
- let lineNum = instance.lineAtHeight(scroll.top, 'local');
- let range = instance.getRange({line: 0, ch: null}, {line: lineNum, ch: null});
- let parser = new DOMParser();
- let doc = parser.parseFromString(md.render(range), 'text/html');
- let totalLines = doc.documentElement.querySelectorAll('body > *');
- scope.$emit('markdown-scroll', totalLines.length);
- });
-
- // Handle image paste
- cm.on('paste', (cm, event) => {
- if (!event.clipboardData || !event.clipboardData.items) return;
- for (let i = 0; i < event.clipboardData.items.length; i++) {
- uploadImage(event.clipboardData.items[i].getAsFile());
- }
- });
-
- // Handle images on drag-drop
- cm.on('drop', (cm, event) => {
- event.stopPropagation();
- event.preventDefault();
- let cursorPos = cm.coordsChar({left: event.pageX, top: event.pageY});
- cm.setCursor(cursorPos);
- if (!event.dataTransfer || !event.dataTransfer.files) return;
- for (let i = 0; i < event.dataTransfer.files.length; i++) {
- uploadImage(event.dataTransfer.files[i]);
- }
- });
-
- // Helper to replace editor content
- function replaceContent(search, replace) {
- let text = cm.getValue();
- let cursor = cm.listSelections();
- cm.setValue(text.replace(search, replace));
- cm.setSelections(cursor);
- }
-
- // Helper to replace the start of the line
- function replaceLineStart(newStart) {
- let cursor = cm.getCursor();
- let lineContent = cm.getLine(cursor.line);
- let lineLen = lineContent.length;
- let lineStart = lineContent.split(' ')[0];
-
- // Remove symbol if already set
- if (lineStart === newStart) {
- lineContent = lineContent.replace(`${newStart} `, '');
- cm.replaceRange(lineContent, {line: cursor.line, ch: 0}, {line: cursor.line, ch: lineLen});
- cm.setCursor({line: cursor.line, ch: cursor.ch - (newStart.length + 1)});
- return;
- }
- let alreadySymbol = /^[#>`]/.test(lineStart);
- let posDif = 0;
- if (alreadySymbol) {
- posDif = newStart.length - lineStart.length;
- lineContent = lineContent.replace(lineStart, newStart).trim();
- } else if (newStart !== '') {
- posDif = newStart.length + 1;
- lineContent = newStart + ' ' + lineContent;
- }
- cm.replaceRange(lineContent, {line: cursor.line, ch: 0}, {line: cursor.line, ch: lineLen});
- cm.setCursor({line: cursor.line, ch: cursor.ch + posDif});
- }
-
- function wrapLine(start, end) {
- let cursor = cm.getCursor();
- let lineContent = cm.getLine(cursor.line);
- let lineLen = lineContent.length;
- let newLineContent = lineContent;
-
- if (lineContent.indexOf(start) === 0 && lineContent.slice(-end.length) === end) {
- newLineContent = lineContent.slice(start.length, lineContent.length - end.length);
- } else {
- newLineContent = `${start}${lineContent}${end}`;
- }
-
- cm.replaceRange(newLineContent, {line: cursor.line, ch: 0}, {line: cursor.line, ch: lineLen});
- cm.setCursor({line: cursor.line, ch: cursor.ch + start.length});
- }
-
- function wrapSelection(start, end) {
- let selection = cm.getSelection();
- if (selection === '') return wrapLine(start, end);
-
- let newSelection = selection;
- let frontDiff = 0;
- let endDiff = 0;
-
- if (selection.indexOf(start) === 0 && selection.slice(-end.length) === end) {
- newSelection = selection.slice(start.length, selection.length - end.length);
- endDiff = -(end.length + start.length);
- } else {
- newSelection = `${start}${selection}${end}`;
- endDiff = start.length + end.length;
- }
-
- let selections = cm.listSelections()[0];
- cm.replaceSelection(newSelection);
- let headFirst = selections.head.ch <= selections.anchor.ch;
- selections.head.ch += headFirst ? frontDiff : endDiff;
- selections.anchor.ch += headFirst ? endDiff : frontDiff;
- cm.setSelections([selections]);
- }
-
- // Handle image upload and add image into markdown content
- function uploadImage(file) {
- if (file === null || file.type.indexOf('image') !== 0) return;
- let ext = 'png';
-
- if (file.name) {
- let fileNameMatches = file.name.match(/\.(.+)$/);
- if (fileNameMatches.length > 1) ext = fileNameMatches[1];
- }
-
- // Insert image into markdown
- let id = "image-" + Math.random().toString(16).slice(2);
- let placeholderImage = window.baseUrl(`/loading.gif#upload${id}`);
- let selectedText = cm.getSelection();
- let placeHolderText = ``;
- cm.replaceSelection(placeHolderText);
-
- let remoteFilename = "image-" + Date.now() + "." + ext;
- let formData = new FormData();
- formData.append('file', file, remoteFilename);
-
- window.$http.post('/images/gallery/upload', formData).then(resp => {
- replaceContent(placeholderImage, resp.data.thumbs.display);
- }).catch(err => {
- events.emit('error', trans('errors.image_upload_error'));
- replaceContent(placeHolderText, selectedText);
- console.log(err);
- });
- }
-
- // Show the popup link selector and insert a link when finished
- function showLinkSelector() {
- let cursorPos = cm.getCursor('from');
- window.EntitySelectorPopup.show(entity => {
- let selectedText = cm.getSelection() || entity.name;
- let newText = `[${selectedText}](${entity.link})`;
- cm.focus();
- cm.replaceSelection(newText);
- cm.setCursor(cursorPos.line, cursorPos.ch + newText.length);
- });
- }
-
- function insertLink() {
- let cursorPos = cm.getCursor('from');
- let selectedText = cm.getSelection() || '';
- let newText = `[${selectedText}]()`;
- cm.focus();
- cm.replaceSelection(newText);
- let cursorPosDiff = (selectedText === '') ? -3 : -1;
- cm.setCursor(cursorPos.line, cursorPos.ch + newText.length+cursorPosDiff);
- }
-
- // Show the image manager and handle image insertion
- function showImageManager() {
- let cursorPos = cm.getCursor('from');
- window.ImageManager.show(image => {
- let selectedText = cm.getSelection();
- let newText = "![" + (selectedText || image.name) + "](" + image.thumbs.display + ")";
- cm.focus();
- cm.replaceSelection(newText);
- cm.setCursor(cursorPos.line, cursorPos.ch + newText.length);
- });
- }
-
- // Update the data models and rendered output
- function update(instance) {
- let content = instance.getValue();
- element.val(content);
- $timeout(() => {
- scope.mdModel = content;
- scope.mdChange(md.render(content));
- });
- }
- update(cm);
-
- // Listen to commands from parent scope
- scope.$on('md-insert-link', showLinkSelector);
- scope.$on('md-insert-image', showImageManager);
- scope.$on('markdown-update', (event, value) => {
- cm.setValue(value);
- element.val(value);
- scope.mdModel = value;
- scope.mdChange(md.render(value));
- });
-
- }
- }
- }]);
-
- /**
- * Markdown Editor
- * Handles all functionality of the markdown editor.
- */
- ngApp.directive('markdownEditor', ['$timeout', '$rootScope', function ($timeout, $rootScope) {
- return {
- restrict: 'A',
- link: function (scope, element, attrs) {
-
- // Editor Elements
- const $display = element.find('.markdown-display').first();
- const $insertImage = element.find('button[data-action="insertImage"]');
- const $insertEntityLink = element.find('button[data-action="insertEntityLink"]');
-
- // Prevent markdown display link click redirect
- $display.on('click', 'a', function(event) {
- event.preventDefault();
- window.open(this.getAttribute('href'));
- });
-
- // Editor UI Actions
- $insertEntityLink.click(e => {scope.$broadcast('md-insert-link');});
- $insertImage.click(e => {scope.$broadcast('md-insert-image');});
+module.exports = function (ngApp, events) {
- // Handle scroll sync event from editor scroll
- $rootScope.$on('markdown-scroll', (event, lineCount) => {
- let elems = $display[0].children[0].children;
- if (elems.length > lineCount) {
- let topElem = (lineCount === -1) ? elems[elems.length-1] : elems[lineCount];
- $display.animate({
- scrollTop: topElem.offsetTop
- }, {queue: false, duration: 200, easing: 'linear'});
- }
- });
- }
- }
- }]);
/**
* Page Editor Toolbox
"use strict";
-
const Code = require('../code');
/**
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']);
+
+ // Save draft shortcut
+ editor.shortcuts.add('meta+S', '', () => {
+ window.$events.emit('editor-save-draft');
+ });
+
// Loop through callout styles
editor.shortcuts.add('meta+9', '', function() {
let selectedNode = editor.selection.getNode();
}
editor.formatter.apply('p');
});
+
}
});
}
+codePlugin();
+
+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);
+ });
-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.addButton('hr', {
+ icon: 'hr',
+ tooltip: 'Horizontal line',
+ cmd: 'InsertHorizontalRule'
+ });
- editor.addMenuItem('hr', {
- icon: 'hr',
- text: 'Horizontal line',
- cmd: 'InsertHorizontalRule',
- context: 'insert'
- });
+ editor.addMenuItem('hr', {
+ icon: 'hr',
+ text: 'Horizontal line',
+ cmd: 'InsertHorizontalRule',
+ context: 'insert'
});
-}
+});
+
+
+
+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')
+ ],
+ 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);
+ });
+ }
-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");
+ }
- if (type === 'image') {
- // Show image manager
- window.ImageManager.show(function (image) {
+ // Replace the actively selected content with the linked image
+ let html = `<a href="${image.url}" target="_blank">`;
+ html += `<img src="${image.thumbs.display}" alt="${image.name}">`;
+ html += '</a>';
+ win.tinyMCE.activeEditor.execCommand('mceInsertContent', false, html);
+ });
+ }
- // 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 = `<a href="${image.url}" target="_blank">`;
- html += `<img src="${image.thumbs.display}" alt="${image.name}">`;
- html += '</a>';
- win.tinyMCE.activeEditor.execCommand('mceInsertContent', false, html);
- });
- }
+ },
+ paste_preprocess: function (plugin, args) {
+ let content = args.content;
+ if (content.indexOf('<img src="file://') !== -1) {
+ args.content = '';
+ }
+ },
+ setup: function (editor) {
- },
- paste_preprocess: function (plugin, args) {
- let content = args.content;
- if (content.indexOf('<img src="file://') !== -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);
- }
+ editor.on('init ExecCommand change input NodeChange ObjectResized', editorChange);
- registerEditorShortcuts(editor);
+ function editorChange() {
+ let content = editor.getContent();
+ window.$events.emit('editor-html-change', content);
+ }
- let wrap;
+ window.$events.listen('editor-html-update', html => {
+ editor.setContent(html);
+ editor.selection.select(editor.getBody(), true);
+ editor.selection.collapse(false);
+ editorChange(html);
+ });
- function hasTextContent(node) {
- return node && !!( node.textContent || node.innerText );
- }
+ registerEditorShortcuts(editor);
- editor.on('dragstart', function () {
- let node = editor.selection.getNode();
+ let wrap;
- if (node.nodeName !== 'IMG') return;
- wrap = editor.dom.getParent(node, '.mceTemp');
+ function hasTextContent(node) {
+ return node && !!( node.textContent || node.innerText );
+ }
- if (!wrap && node.parentNode.nodeName === 'A' && !hasTextContent(node.parentNode)) {
- wrap = node.parentNode;
- }
- });
+ editor.on('dragstart', function () {
+ let node = editor.selection.getNode();
- editor.on('drop', function (event) {
- 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.
- if (dom.getParent(rng.startContainer, '.mceTemp')) {
- event.preventDefault();
- } else if (wrap) {
- event.preventDefault();
-
- editor.undoManager.transact(function () {
- editor.selection.setRng(rng);
- editor.selection.setNode(wrap);
- dom.remove(wrap);
- });
- }
+ if (node.nodeName !== 'IMG') return;
+ wrap = editor.dom.getParent(node, '.mceTemp');
- wrap = null;
- });
+ if (!wrap && node.parentNode.nodeName === 'A' && !hasTextContent(node.parentNode)) {
+ wrap = node.parentNode;
+ }
+ });
- // 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 = `<a href="${image.url}" target="_blank">`;
- html += `<img src="${image.thumbs.display}" alt="${image.name}">`;
- html += '</a>';
- editor.execCommand('mceInsertContent', false, html);
- });
- }
- });
+ editor.on('drop', function (event) {
+ let dom = editor.dom,
+ rng = tinymce.dom.RangeUtils.getCaretRangeFromPoint(event.clientX, event.clientY, editor.getDoc());
- // Paste image-uploads
- editor.on('paste', event => { editorPaste(event, editor) });
- }
- };
- return settings;
+ // Don't allow anything to be dropped in a captioned image.
+ if (dom.getParent(rng.startContainer, '.mceTemp')) {
+ event.preventDefault();
+ } else if (wrap) {
+ event.preventDefault();
+
+ editor.undoManager.transact(function () {
+ editor.selection.setRng(rng);
+ editor.selection.setNode(wrap);
+ dom.remove(wrap);
+ });
+ }
+
+ wrap = null;
+ });
+
+ // 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 = `<a href="${image.url}" target="_blank">`;
+ html += `<img src="${image.thumbs.display}" alt="${image.name}">`;
+ html += '</a>';
+ editor.execCommand('mceInsertContent', false, html);
+ });
+ }
+ });
+
+ // Paste image-uploads
+ editor.on('paste', event => { editorPaste(event, editor) });
+ }
};
\ No newline at end of file
{{--WYSIWYG Editor--}}
@if(setting('app-editor') === 'wysiwyg')
- <div tinymce="editorOptions" mce-change="editorChange" mce-model="editContent" class="flex-fill flex">
+ <div wysiwyg-editor class="flex-fill flex">
<textarea id="html-editor" name="html" rows="5" ng-non-bindable
- @if($errors->has('html')) class="neg" @endif>@if(isset($model) || old('html')){{htmlspecialchars( old('html') ? old('html') : $model->html)}}@endif</textarea>
+ @if($errors->has('html')) class="neg" @endif>@if(isset($model) || old('html')){{htmlspecialchars( old('html') ? old('html') : $model->html)}}@endif</textarea>
</div>
@if($errors->has('html'))
{{--Markdown Editor--}}
@if(setting('app-editor') === 'markdown')
- <div id="markdown-editor" markdown-editor class="flex-fill flex code-fill">
+ <div ng-non-bindable id="markdown-editor" markdown-editor class="flex-fill flex code-fill">
<div class="markdown-editor-wrap">
<div class="editor-toolbar">
<div class="float right buttons">
<button class="text-button" type="button" data-action="insertImage"><i class="zmdi zmdi-image"></i>{{ trans('entities.pages_md_insert_image') }}</button>
|
- <button class="text-button" type="button" data-action="insertEntityLink"><i class="zmdi zmdi-link"></i>{{ trans('entities.pages_md_insert_link') }}</button>
+ <button class="text-button" type="button" data-action="insertLink"><i class="zmdi zmdi-link"></i>{{ trans('entities.pages_md_insert_link') }}</button>
</div>
</div>
<div markdown-input md-change="editorChange" md-model="editContent" class="flex flex-fill">
- <textarea ng-non-bindable id="markdown-editor-input" name="markdown" rows="5"
+ <textarea id="markdown-editor-input" name="markdown" rows="5"
@if($errors->has('markdown')) class="neg" @endif>@if(isset($model) || old('markdown')){{htmlspecialchars( old('markdown') ? old('markdown') : ($model->markdown === '' ? $model->html : $model->markdown))}}@endif</textarea>
</div>
<div class="page-content" ng-bind-html="displayContent"></div>
</div>
</div>
+ <input type="hidden" name="html"/>
</div>
- <input type="hidden" name="html" ng-value="displayContent">
+
@if($errors->has('markdown'))
<div class="text-neg text-small">{{ $errors->first('markdown') }}</div>
projects / bookstack / commitdiff