X-Git-Url: http://source.bookstackapp.com/bookstack/blobdiff_plain/08c4b9ac7c56ae34a350643da5d0fada2cbef2cc..refs/pull/448/head:/resources/assets/js/directives.js diff --git a/resources/assets/js/directives.js b/resources/assets/js/directives.js index 28c4f6e17..d783fd682 100644 --- a/resources/assets/js/directives.js +++ b/resources/assets/js/directives.js @@ -1,38 +1,10 @@ "use strict"; -import DropZone from "dropzone"; -import markdown from "marked"; +const DropZone = require("dropzone"); +const MarkdownIt = require("markdown-it"); +const mdTasksLists = require('markdown-it-task-lists'); +const code = require('./code'); -export default function (ngApp, events) { - - /** - * Toggle Switches - * Has basic on/off functionality. - * Use string values of 'true' & 'false' to dictate the current state. - */ - ngApp.directive('toggleSwitch', function () { - return { - restrict: 'A', - template: ` -
- -
-
- `, - scope: true, - link: function (scope, element, attrs) { - scope.name = attrs.name; - scope.value = attrs.value; - scope.isActive = scope.value == true && scope.value != 'false'; - scope.value = (scope.value == true && scope.value != 'false') ? 'true' : 'false'; - - scope.switch = function () { - scope.isActive = !scope.isActive; - scope.value = scope.isActive ? 'true' : 'false'; - } - - } - }; - }); +module.exports = function (ngApp, events) { /** * Common tab controls using simple jQuery functions. @@ -65,7 +37,7 @@ export default function (ngApp, events) { }); /** - * Sub form component to allow inner-form sections to act like thier own forms. + * Sub form component to allow inner-form sections to act like their own forms. */ ngApp.directive('subForm', function() { return { @@ -80,96 +52,13 @@ export default function (ngApp, events) { element.find('button[type="submit"]').click(submitEvent); function submitEvent(e) { - e.preventDefault() + e.preventDefault(); if (attrs.subForm) scope.$eval(attrs.subForm); } } }; }); - - /** - * Image Picker - * Is a simple front-end interface that connects to an ImageManager if present. - */ - ngApp.directive('imagePicker', ['$http', 'imageManagerService', function ($http, imageManagerService) { - return { - restrict: 'E', - template: ` -
-
- Image Preview - Image Preview -
- -
- - - | - - - -
- `, - scope: { - name: '@', - resizeHeight: '@', - resizeWidth: '@', - resizeCrop: '@', - showRemove: '=', - currentImage: '@', - currentId: '@', - defaultImage: '@', - imageClass: '@' - }, - link: function (scope, element, attrs) { - let usingIds = typeof scope.currentId !== 'undefined' || scope.currentId === 'false'; - scope.image = scope.currentImage; - scope.value = scope.currentImage || ''; - if (usingIds) scope.value = scope.currentId; - - function setImage(imageModel, imageUrl) { - scope.image = imageUrl; - scope.value = usingIds ? imageModel.id : imageUrl; - } - - scope.reset = function () { - setImage({id: 0}, scope.defaultImage); - }; - - scope.remove = function () { - scope.image = 'none'; - scope.value = 'none'; - }; - - scope.showImageManager = function () { - imageManagerService.show((image) => { - scope.updateImageFromModel(image); - }); - }; - - scope.updateImageFromModel = function (model) { - let isResized = scope.resizeWidth && scope.resizeHeight; - - if (!isResized) { - scope.$apply(() => { - setImage(model, model.url); - }); - return; - } - - let cropped = scope.resizeCrop ? 'true' : 'false'; - let requestString = '/images/thumb/' + model.id + '/' + scope.resizeWidth + '/' + scope.resizeHeight + '/' + cropped; - requestString = window.baseUrl(requestString); - $http.get(requestString).then((response) => { - setImage(model, response.data.url); - }); - }; - - } - }; - }]); - /** * DropZone * Used for uploading images @@ -179,16 +68,17 @@ export default function (ngApp, events) { restrict: 'E', template: `
-
Drop files or click here to upload
+
{{message}}
`, scope: { uploadUrl: '@', eventSuccess: '=', eventError: '=', - uploadedTo: '@' + uploadedTo: '@', }, link: function (scope, element, attrs) { + scope.message = attrs.message; if (attrs.placeholder) element[0].querySelector('.dz-message').textContent = attrs.placeholder; let dropZone = new DropZone(element[0].querySelector('.dropzone-container'), { url: scope.uploadUrl, @@ -214,7 +104,7 @@ export default function (ngApp, events) { $(file.previewElement).find('[data-dz-errormessage]').text(message); } - if (xhr.status === 413) setMessage('The server does not allow uploads of this size. Please try a smaller file.'); + if (xhr.status === 413) setMessage(trans('errors.server_upload_limit')); if (errorMessage.file) setMessage(errorMessage.file[0]); }); @@ -233,25 +123,31 @@ export default function (ngApp, events) { restrict: 'A', link: function (scope, element, attrs) { const menu = element.find('ul'); - element.find('[dropdown-toggle]').on('click', function () { + + function hide() { + menu.hide(); + menu.removeClass('anim menuIn'); + } + + function show() { menu.show().addClass('anim menuIn'); + element.mouseleave(hide); + + // Focus on input if exist in dropdown and hide on enter press let inputs = menu.find('input'); - let hasInput = inputs.length > 0; - if (hasInput) { - inputs.first().focus(); - element.on('keypress', 'input', event => { - if (event.keyCode === 13) { - event.preventDefault(); - menu.hide(); - menu.removeClass('anim menuIn'); - return false; - } - }); - } - element.mouseleave(function () { - menu.hide(); - menu.removeClass('anim menuIn'); - }); + if (inputs.length > 0) inputs.first().focus(); + } + + // Hide menu on option click + element.on('click', '> ul a', hide); + // Show dropdown on toggle click. + element.find('[dropdown-toggle]').on('click', show); + // Hide menu on enter press in inputs + element.on('keypress', 'input', event => { + if (event.keyCode !== 13) return true; + event.preventDefault(); + hide(); + return false; }); } }; @@ -326,6 +222,9 @@ export default function (ngApp, events) { } }]); + const md = new MarkdownIt({html: true}); + md.use(mdTasksLists, {label: true}); + /** * Markdown input * Handles the logic for just the editor input field. @@ -339,214 +238,190 @@ export default function (ngApp, events) { }, link: function (scope, element, attrs) { - // Set initial model content + // Codemirror Setup element = element.find('textarea').first(); - let content = element.val(); - scope.mdModel = content; - scope.mdChange(markdown(content)); - - element.on('change input', (event) => { - content = element.val(); - $timeout(() => { - scope.mdModel = content; - scope.mdChange(markdown(content)); - }); - }); - - scope.$on('markdown-update', (event, value) => { - element.val(value); - scope.mdModel = value; - scope.mdChange(markdown(value)); - }); - - } - } - }]); - - /** - * Markdown Editor - * Handles all functionality of the markdown editor. - */ - ngApp.directive('markdownEditor', ['$timeout', function ($timeout) { - return { - restrict: 'A', - link: function (scope, element, attrs) { - - // Elements - const input = element.find('[markdown-input] textarea').first(); - const display = element.find('.markdown-display').first(); - const insertImage = element.find('button[data-action="insertImage"]'); - const insertEntityLink = element.find('button[data-action="insertEntityLink"]') - - let currentCaretPos = 0; - - input.blur(event => { - currentCaretPos = input[0].selectionStart; - }); - - // Scroll sync - let inputScrollHeight, - inputHeight, - displayScrollHeight, - displayHeight; - - function setScrollHeights() { - inputScrollHeight = input[0].scrollHeight; - inputHeight = input.height(); - displayScrollHeight = display[0].scrollHeight; - displayHeight = display.height(); - } - - setTimeout(() => { - setScrollHeights(); - }, 200); - window.addEventListener('resize', setScrollHeights); - let scrollDebounceTime = 800; - let lastScroll = 0; - input.on('scroll', event => { - let now = Date.now(); - if (now - lastScroll > scrollDebounceTime) { - setScrollHeights() - } - let scrollPercent = (input.scrollTop() / (inputScrollHeight - inputHeight)); - let displayScrollY = (displayScrollHeight - displayHeight) * scrollPercent; - display.scrollTop(displayScrollY); - lastScroll = now; + 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 = `![${selectedText}](http://)`; + 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()}; + cm.setOption('extraKeys', extraKeys); + + // Update data on content change + cm.on('change', (instance, changeObj) => { + update(instance); }); - // Editor key-presses - input.keydown(event => { - // Insert image shortcut - if (event.which === 73 && event.ctrlKey && event.shiftKey) { - event.preventDefault(); - let caretPos = input[0].selectionStart; - let currentContent = input.val(); - const mdImageText = "![](http://)"; - input.val(currentContent.substring(0, caretPos) + mdImageText + currentContent.substring(caretPos)); - input.focus(); - input[0].selectionStart = caretPos + ("![](".length); - input[0].selectionEnd = caretPos + ('![](http://'.length); + // 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; } - - // Insert entity link shortcut - if (event.which === 75 && event.ctrlKey && event.shiftKey) { - showLinkSelector(); - return; - } - - // Pass key presses to controller via event - scope.$emit('editor-keydown', event); + 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); }); - // Insert image from image manager - insertImage.click(event => { - window.ImageManager.showExternal(image => { - let caretPos = currentCaretPos; - let currentContent = input.val(); - let mdImageText = "![" + image.name + "](" + image.thumbs.display + ")"; - input.val(currentContent.substring(0, caretPos) + mdImageText + currentContent.substring(caretPos)); - input.change(); - }); - }); - - function showLinkSelector() { - window.showEntityLinkSelector((entity) => { - let selectionStart = currentCaretPos; - let selectionEnd = input[0].selectionEnd; - let textSelected = (selectionEnd !== selectionStart); - let currentContent = input.val(); - - if (textSelected) { - let selectedText = currentContent.substring(selectionStart, selectionEnd); - let linkText = `[${selectedText}](${entity.link})`; - input.val(currentContent.substring(0, selectionStart) + linkText + currentContent.substring(selectionEnd)); - } else { - let linkText = ` [${entity.name}](${entity.link}) `; - input.val(currentContent.substring(0, selectionStart) + linkText + currentContent.substring(selectionStart)) - } - input.change(); - }); - } - insertEntityLink.click(showLinkSelector); - - // Upload and insert image on paste - function editorPaste(e) { - e = e.originalEvent; - if (!e.clipboardData) return - let items = e.clipboardData.items; - if (!items) return; - for (let i = 0; i < items.length; i++) { - uploadImage(items[i].getAsFile()); + // 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()); } - } - - input.on('paste', editorPaste); + }); - // Handle image drop, Uploads images to BookStack. - function handleImageDrop(event) { + // Handle images on drag-drop + cm.on('drop', (cm, event) => { event.stopPropagation(); event.preventDefault(); - let files = event.originalEvent.dataTransfer.files; - for (let i = 0; i < files.length; i++) { - uploadImage(files[i]); + 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]); } - } + }); - input.on('drop', handleImageDrop); + // 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); + } // Handle image upload and add image into markdown content function uploadImage(file) { - if (file.type.indexOf('image') !== 0) return; - let formData = new FormData(); + if (file === null || file.type.indexOf('image') !== 0) return; let ext = 'png'; - let xhr = new XMLHttpRequest(); if (file.name) { let fileNameMatches = file.name.match(/\.(.+)$/); - if (fileNameMatches) { - ext = fileNameMatches[1]; - } + if (fileNameMatches.length > 1) ext = fileNameMatches[1]; } // Insert image into markdown let id = "image-" + Math.random().toString(16).slice(2); - let selectStart = input[0].selectionStart; - let selectEnd = input[0].selectionEnd; - let content = input[0].value; - let selectText = content.substring(selectStart, selectEnd); let placeholderImage = window.baseUrl(`/loading.gif#upload${id}`); - let innerContent = ((selectEnd > selectStart) ? `![${selectText}]` : '![]') + `(${placeholderImage})`; - input[0].value = content.substring(0, selectStart) + innerContent + content.substring(selectEnd); - - input.focus(); - input[0].selectionStart = selectStart; - input[0].selectionEnd = selectStart; + let selectedText = cm.getSelection(); + let placeHolderText = `![${selectedText}](${placeholderImage})`; + cm.replaceSelection(placeHolderText); let remoteFilename = "image-" + Date.now() + "." + ext; + let formData = new FormData(); formData.append('file', file, remoteFilename); - formData.append('_token', document.querySelector('meta[name="token"]').getAttribute('content')); - - xhr.open('POST', window.baseUrl('/images/gallery/upload')); - xhr.onload = function () { - let selectStart = input[0].selectionStart; - if (xhr.status === 200 || xhr.status === 201) { - let result = JSON.parse(xhr.responseText); - input[0].value = input[0].value.replace(placeholderImage, result.thumbs.display); - input.change(); - } else { - console.log('An error occurred uploading the image'); - console.log(xhr.responseText); - input[0].value = input[0].value.replace(innerContent, ''); - input.change(); - } - input.focus(); - input[0].selectionStart = selectStart; - input[0].selectionEnd = selectStart; - }; - xhr.send(formData); + + 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.showEntityLinkSelector(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); + }); + } + + // Show the image manager and handle image insertion + function showImageManager() { + let cursorPos = cm.getCursor('from'); + window.ImageManager.showExternal(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');}); + + // 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'}); + } + }); } } }]); @@ -680,8 +555,7 @@ export default function (ngApp, events) { } // Enter or tab key else if ((event.keyCode === 13 || event.keyCode === 9) && !event.shiftKey) { - let text = suggestionElems[active].textContent; - currentInput[0].value = text; + currentInput[0].value = suggestionElems[active].textContent; currentInput.focus(); $suggestionBox.hide(); isShowing = false; @@ -777,7 +651,7 @@ export default function (ngApp, events) { ngApp.directive('entityLinkSelector', [function($http) { return { - restict: 'A', + restrict: 'A', link: function(scope, element, attrs) { const selectButton = element.find('.entity-link-selector-confirm');