X-Git-Url: http://source.bookstackapp.com/bookstack/blobdiff_plain/10418323ef12f60b23632484a2a01e5a20846ddb..refs/pull/448/head:/resources/assets/js/directives.js
diff --git a/resources/assets/js/directives.js b/resources/assets/js/directives.js
index 0119ded42..d783fd682 100644
--- a/resources/assets/js/directives.js
+++ b/resources/assets/js/directives.js
@@ -1,104 +1,63 @@
"use strict";
-var DropZone = require('dropzone');
-var markdown = require('marked');
-
-var toggleSwitchTemplate = require('./components/toggle-switch.html');
-var imagePickerTemplate = require('./components/image-picker.html');
-var dropZoneTemplate = require('./components/drop-zone.html');
+const DropZone = require("dropzone");
+const MarkdownIt = require("markdown-it");
+const mdTasksLists = require('markdown-it-task-lists');
+const code = require('./code');
module.exports = function (ngApp, events) {
/**
- * Toggle Switches
- * Has basic on/off functionality.
- * Use string values of 'true' & 'false' to dictate the current state.
+ * Common tab controls using simple jQuery functions.
*/
- ngApp.directive('toggleSwitch', function () {
+ ngApp.directive('tabContainer', function() {
return {
restrict: 'A',
- template: toggleSwitchTemplate,
- 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';
+ const $content = element.find('[tab-content]');
+ const $buttons = element.find('[tab-button]');
+
+ if (attrs.tabContainer) {
+ let initial = attrs.tabContainer;
+ $buttons.filter(`[tab-button="${initial}"]`).addClass('selected');
+ $content.hide().filter(`[tab-content="${initial}"]`).show();
+ } else {
+ $content.hide().first().show();
+ $buttons.first().addClass('selected');
}
+ $buttons.click(function() {
+ let clickedTab = $(this);
+ $buttons.removeClass('selected');
+ $content.hide();
+ let name = clickedTab.addClass('selected').attr('tab-button');
+ $content.filter(`[tab-content="${name}"]`).show();
+ });
}
};
});
-
/**
- * Image Picker
- * Is a simple front-end interface that connects to an ImageManager if present.
+ * Sub form component to allow inner-form sections to act like their own forms.
*/
- ngApp.directive('imagePicker', ['$http', 'imageManagerService', function ($http, imageManagerService) {
+ ngApp.directive('subForm', function() {
return {
- restrict: 'E',
- template: imagePickerTemplate,
- scope: {
- name: '@',
- resizeHeight: '@',
- resizeWidth: '@',
- resizeCrop: '@',
- showRemove: '=',
- currentImage: '@',
- currentId: '@',
- defaultImage: '@',
- imageClass: '@'
- },
+ restrict: 'A',
link: function (scope, element, attrs) {
- var 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) {
- var isResized = scope.resizeWidth && scope.resizeHeight;
-
- if (!isResized) {
- scope.$apply(() => {
- setImage(model, model.url);
- });
- return;
+ element.on('keypress', e => {
+ if (e.keyCode === 13) {
+ submitEvent(e);
}
+ });
- var cropped = scope.resizeCrop ? 'true' : 'false';
- var requestString = '/images/thumb/' + model.id + '/' + scope.resizeWidth + '/' + scope.resizeHeight + '/' + cropped;
- $http.get(requestString).then((response) => {
- setImage(model, response.data.url);
- });
- };
+ element.find('button[type="submit"]').click(submitEvent);
+ function submitEvent(e) {
+ e.preventDefault();
+ if (attrs.subForm) scope.$eval(attrs.subForm);
+ }
}
};
- }]);
+ });
/**
* DropZone
@@ -107,22 +66,28 @@ module.exports = function (ngApp, events) {
ngApp.directive('dropZone', [function () {
return {
restrict: 'E',
- template: dropZoneTemplate,
+ template: `
+
+ `,
scope: {
uploadUrl: '@',
eventSuccess: '=',
eventError: '=',
- uploadedTo: '@'
+ uploadedTo: '@',
},
link: function (scope, element, attrs) {
- var dropZone = new DropZone(element[0].querySelector('.dropzone-container'), {
+ 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,
init: function () {
- var dz = this;
+ let dz = this;
dz.on('sending', function (file, xhr, data) {
- var token = window.document.querySelector('meta[name=token]').getAttribute('content');
+ let token = window.document.querySelector('meta[name=token]').getAttribute('content');
data.append('_token', token);
- var uploadedTo = typeof scope.uploadedTo === 'undefined' ? 0 : scope.uploadedTo;
+ let uploadedTo = typeof scope.uploadedTo === 'undefined' ? 0 : scope.uploadedTo;
data.append('uploaded_to', uploadedTo);
});
if (typeof scope.eventSuccess !== 'undefined') dz.on('success', scope.eventSuccess);
@@ -139,7 +104,7 @@ module.exports = 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]);
});
@@ -157,13 +122,32 @@ module.exports = function (ngApp, events) {
return {
restrict: 'A',
link: function (scope, element, attrs) {
- var menu = element.find('ul');
- element.find('[dropdown-toggle]').on('click', function () {
+ const menu = element.find('ul');
+
+ function hide() {
+ menu.hide();
+ menu.removeClass('anim menuIn');
+ }
+
+ function show() {
menu.show().addClass('anim menuIn');
- element.mouseleave(function () {
- menu.hide();
- menu.removeClass('anim menuIn');
- });
+ element.mouseleave(hide);
+
+ // Focus on input if exist in dropdown and hide on enter press
+ let inputs = menu.find('input');
+ 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;
});
}
};
@@ -185,7 +169,7 @@ module.exports = function (ngApp, events) {
function tinyMceSetup(editor) {
editor.on('ExecCommand change NodeChange ObjectResized', (e) => {
- var content = editor.getContent();
+ let content = editor.getContent();
$timeout(() => {
scope.mceModel = content;
});
@@ -213,9 +197,9 @@ module.exports = function (ngApp, events) {
// Custom tinyMCE plugins
tinymce.PluginManager.add('customhr', function (editor) {
editor.addCommand('InsertHorizontalRule', function () {
- var hrElem = document.createElement('hr');
- var cNode = editor.selection.getNode();
- var parentNode = cNode.parentNode;
+ let hrElem = document.createElement('hr');
+ let cNode = editor.selection.getNode();
+ let parentNode = cNode.parentNode;
parentNode.insertBefore(hrElem, cNode);
});
@@ -238,6 +222,9 @@ module.exports = 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.
@@ -251,23 +238,150 @@ module.exports = function (ngApp, events) {
},
link: function (scope, element, attrs) {
- // Set initial model content
- var content = element.val();
- scope.mdModel = content;
- scope.mdChange(markdown(content));
+ // 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()};
+ 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);
+ }
+
+ // 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.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 = "";
+ cm.focus();
+ cm.replaceSelection(newText);
+ cm.setCursor(cursorPos.line, cursorPos.ch + newText.length);
+ });
+ }
- element.on('change input', (e) => {
- content = element.val();
+ // Update the data models and rendered output
+ function update(instance) {
+ let content = instance.getValue();
+ element.val(content);
$timeout(() => {
scope.mdModel = content;
- scope.mdChange(markdown(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(markdown(value));
+ scope.mdChange(md.render(value));
});
}
@@ -278,81 +392,36 @@ module.exports = function (ngApp, events) {
* Markdown Editor
* Handles all functionality of the markdown editor.
*/
- ngApp.directive('markdownEditor', ['$timeout', function ($timeout) {
+ ngApp.directive('markdownEditor', ['$timeout', '$rootScope', function ($timeout, $rootScope) {
return {
restrict: 'A',
link: function (scope, element, attrs) {
- // Elements
- const input = element.find('textarea[markdown-input]');
- const display = element.find('.markdown-display').first();
- const insertImage = element.find('button[data-action="insertImage"]');
-
- let currentCaretPos = 0;
-
- input.blur(event => {
- currentCaretPos = input[0].selectionStart;
- });
+ // 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"]');
- // 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;
+ // Prevent markdown display link click redirect
+ $display.on('click', 'a', function(event) {
+ event.preventDefault();
+ window.open(this.getAttribute('href'));
});
- // Editor key-presses
- input.keydown(event => {
- // Insert image shortcut
- if (event.which === 73 && event.ctrlKey && event.shiftKey) {
- event.preventDefault();
- var caretPos = input[0].selectionStart;
- var currentContent = input.val();
- var mdImageText = "";
- input.val(currentContent.substring(0, caretPos) + mdImageText + currentContent.substring(caretPos));
- input.focus();
- input[0].selectionStart = caretPos + (";
- input[0].selectionEnd = caretPos + (';
- return;
+ // 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'});
}
- // Pass key presses to controller via event
- scope.$emit('editor-keydown', event);
- });
-
- // Insert image from image manager
- insertImage.click(event => {
- window.ImageManager.showExternal(image => {
- var caretPos = currentCaretPos;
- var currentContent = input.val();
- var mdImageText = "";
- input.val(currentContent.substring(0, caretPos) + mdImageText + currentContent.substring(caretPos));
- input.change();
- });
});
-
}
}
}]);
@@ -368,8 +437,8 @@ module.exports = function (ngApp, events) {
link: function (scope, elem, attrs) {
// Get common elements
- const $buttons = elem.find('[tab-button]');
- const $content = elem.find('[tab-content]');
+ const $buttons = elem.find('[toolbox-tab-button]');
+ const $content = elem.find('[toolbox-tab-content]');
const $toggle = elem.find('[toolbox-toggle]');
// Handle toolbox toggle click
@@ -381,17 +450,17 @@ module.exports = function (ngApp, events) {
function setActive(tabName, openToolbox) {
$buttons.removeClass('active');
$content.hide();
- $buttons.filter(`[tab-button="${tabName}"]`).addClass('active');
- $content.filter(`[tab-content="${tabName}"]`).show();
+ $buttons.filter(`[toolbox-tab-button="${tabName}"]`).addClass('active');
+ $content.filter(`[toolbox-tab-content="${tabName}"]`).show();
if (openToolbox) elem.addClass('open');
}
// Set the first tab content active on load
- setActive($content.first().attr('tab-content'), false);
+ setActive($content.first().attr('toolbox-tab-content'), false);
// Handle tab button click
$buttons.click(function (e) {
- let name = $(this).attr('tab-button');
+ let name = $(this).attr('toolbox-tab-button');
setActive(name, true);
});
}
@@ -429,7 +498,7 @@ module.exports = function (ngApp, events) {
let val = $input.val();
let url = $input.attr('autosuggest');
let type = $input.attr('autosuggest-type');
-
+
// Add name param to request if for a value
if (type.toLowerCase() === 'value') {
let $nameInput = $input.closest('tr').find('[autosuggest-type="name"]').first();
@@ -486,8 +555,7 @@ module.exports = 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;
@@ -538,14 +606,13 @@ module.exports = function (ngApp, events) {
// Build suggestions
$suggestionBox[0].innerHTML = '';
for (let i = 0; i < suggestions.length; i++) {
- var suggestion = document.createElement('li');
+ let suggestion = document.createElement('li');
suggestion.textContent = suggestions[i];
suggestion.onclick = suggestionClick;
if (i === 0) {
- suggestion.className = 'active'
+ suggestion.className = 'active';
active = 0;
}
- ;
$suggestionBox[0].appendChild(suggestion);
}
@@ -554,12 +621,11 @@ module.exports = function (ngApp, events) {
// Suggestion click event
function suggestionClick(event) {
- let text = this.textContent;
- currentInput[0].value = text;
+ currentInput[0].value = this.textContent;
currentInput.focus();
$suggestionBox.hide();
isShowing = false;
- };
+ }
// Get suggestions & cache
function getSuggestions(input, url) {
@@ -583,6 +649,58 @@ module.exports = function (ngApp, events) {
}
}]);
+ ngApp.directive('entityLinkSelector', [function($http) {
+ return {
+ restrict: 'A',
+ link: function(scope, element, attrs) {
+
+ const selectButton = element.find('.entity-link-selector-confirm');
+ let callback = false;
+ let entitySelection = null;
+
+ // Handle entity selection change, Stores the selected entity locally
+ function entitySelectionChange(entity) {
+ entitySelection = entity;
+ if (entity === null) {
+ selectButton.attr('disabled', 'true');
+ } else {
+ selectButton.removeAttr('disabled');
+ }
+ }
+ events.listen('entity-select-change', entitySelectionChange);
+
+ // Handle selection confirm button click
+ selectButton.click(event => {
+ hide();
+ if (entitySelection !== null) callback(entitySelection);
+ });
+
+ // Show selector interface
+ function show() {
+ element.fadeIn(240);
+ }
+
+ // Hide selector interface
+ function hide() {
+ element.fadeOut(240);
+ }
+
+ // Listen to confirmation of entity selections (doubleclick)
+ events.listen('entity-select-confirm', entity => {
+ hide();
+ callback(entity);
+ });
+
+ // Show entity selector, Accessible globally, and store the callback
+ window.showEntityLinkSelector = function(passedCallback) {
+ show();
+ callback = passedCallback;
+ };
+
+ }
+ };
+ }]);
+
ngApp.directive('entitySelector', ['$http', '$sce', function ($http, $sce) {
return {
@@ -596,32 +714,66 @@ module.exports = function (ngApp, events) {
// Add input for forms
const input = element.find('[entity-selector-input]').first();
+ // Detect double click events
+ let lastClick = 0;
+ function isDoubleClick() {
+ let now = Date.now();
+ let answer = now - lastClick < 300;
+ lastClick = now;
+ return answer;
+ }
+
// Listen to entity item clicks
element.on('click', '.entity-list a', function(event) {
event.preventDefault();
event.stopPropagation();
let item = $(this).closest('[data-entity-type]');
- itemSelect(item);
+ itemSelect(item, isDoubleClick());
});
element.on('click', '[data-entity-type]', function(event) {
- itemSelect($(this));
+ itemSelect($(this), isDoubleClick());
});
// Select entity action
- function itemSelect(item) {
+ function itemSelect(item, doubleClick) {
let entityType = item.attr('data-entity-type');
let entityId = item.attr('data-entity-id');
- let isSelected = !item.hasClass('selected');
+ let isSelected = !item.hasClass('selected') || doubleClick;
element.find('.selected').removeClass('selected').removeClass('primary-background');
if (isSelected) item.addClass('selected').addClass('primary-background');
let newVal = isSelected ? `${entityType}:${entityId}` : '';
input.val(newVal);
+
+ if (!isSelected) {
+ events.emit('entity-select-change', null);
+ }
+
+ if (!doubleClick && !isSelected) return;
+
+ let link = item.find('.entity-list-item-link').attr('href');
+ let name = item.find('.entity-list-item-name').text();
+
+ if (doubleClick) {
+ events.emit('entity-select-confirm', {
+ id: Number(entityId),
+ name: name,
+ link: link
+ });
+ }
+
+ if (isSelected) {
+ events.emit('entity-select-change', {
+ id: Number(entityId),
+ name: name,
+ link: link
+ });
+ }
}
// Get search url with correct types
function getSearchUrl() {
let types = (attrs.entityTypes) ? encodeURIComponent(attrs.entityTypes) : encodeURIComponent('page,book,chapter');
- return `/ajax/search/entities?types=${types}`;
+ return window.baseUrl(`/ajax/search/entities?types=${types}`);
}
// Get initial contents
@@ -644,17 +796,3 @@ module.exports = function (ngApp, events) {
};
}]);
};
-
-
-
-
-
-
-
-
-
-
-
-
-
-