github-mirror/BookStack
2
0
Fork 0
mirror of https://github.com/BookStackApp/BookStack.git synced 2025-05-28 02:40:05 +08:00
Code Issues Actions 11 Packages Projects Releases Wiki Activity

Switched out markdown render

Browse Source 
Fixes #304.
Fixes #359.
This commit is contained in:
Dan Brown
2017-04-17 12:21:10 +01:00
parent ec7be1b08b
commit fde970ba59
4 changed files with 25 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
resources/assets/js/directives.js
View File

@ -1,6 +1,7 @@
"use strict";
const DropZone = require("dropzone");
const markdown = require("marked");
const MarkdownIt = require("markdown-it");
const mdTasksLists = require('markdown-it-task-lists');
module.exports = function (ngApp, events) {
@ -214,18 +215,8 @@ module.exports = function (ngApp, events) {
}
}]);
let renderer = new markdown.Renderer();
// Custom markdown checkbox list item
// Attribution: https://github.com/chjj/marked/issues/107#issuecomment-44542001
renderer.listitem = function(text) {
if (/^\s*\[[x ]\]\s*/.test(text)) {
text = text
.replace(/^\s*\[ \]\s*/, '<input type="checkbox"/>')
.replace(/^\s*\[x\]\s*/, '<input type="checkbox" checked/>');
return `<li class="checkbox-item">${text}</li>`;
}
return `<li>${text}</li>`;
};
const md = new MarkdownIt();
md.use(mdTasksLists, {label: true});
/**
* Markdown input
@ -244,20 +235,20 @@ module.exports = function (ngApp, events) {
element = element.find('textarea').first();
let content = element.val();
scope.mdModel = content;
scope.mdChange(markdown(content, {renderer: renderer}));
scope.mdChange(md.render(content));
element.on('change input', (event) => {
content = element.val();
$timeout(() => {
scope.mdModel = content;
scope.mdChange(markdown(content, {renderer: renderer}));
scope.mdChange(md.render(content));
});
});
scope.$on('markdown-update', (event, value) => {
element.val(value);
scope.mdModel = value;
scope.mdChange(markdown(value));
scope.mdChange(md.render(value));
});
}