Merge pull request #10 from BookStackApp/master

[bookstack] / resources / assets / js / directives.js

diff --git a/resources/assets/js/directives.js b/resources/assets/js/directives.js
index 19badcac83e5f570101305b250b3f099a8cef559..cae07a1663cde3aa70024be61287ab1454f20e95 100644 (file)
--- a/resources/assets/js/directives.js
+++ b/resources/assets/js/directives.js
@@ -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({html: true});
+    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));
                 });
 
             }
@@ -827,4 +818,99 @@ module.exports = function (ngApp, events) {
             }
         };
     }]);
+
+
+    ngApp.directive('simpleMarkdownInput', ['$timeout', function ($timeout) {
+        return {
+            restrict: 'A',
+            scope: {
+                smdModel: '=',
+                smdChange: '=',
+                smdGetContent: '=',
+                smdClear: '='
+            },
+            link: function (scope, element, attrs) {
+                // Set initial model content
+                element = element.find('textarea').first();
+                let simplemde = new SimpleMDE({
+                    element: element[0],
+                    status: []
+                });
+                let content = element.val();
+                simplemde.value(content)
+                scope.smdModel = content;
+
+                simplemde.codemirror.on('change', (event) => {
+                    content = simplemde.value();
+                    $timeout(() => {
+                        scope.smdModel = content;
+                        if (scope.smdChange) {
+                            scope.smdChange(element, content);
+                        }
+                    });
+                });
+                
+                if ('smdGetContent' in attrs) {
+                    scope.smdGetContent = function () {
+                        return simplemde.options.previewRender(simplemde.value());
+                    };
+                }
+                
+                if ('smdClear' in attrs) {
+                    scope.smdClear = function () {
+                        simplemde.value('');
+                        scope.smdModel = '';                        
+                    };
+                }
+            }
+        }
+    }]);
+    
+    ngApp.directive('commentReply', ['$timeout', function ($timeout) {        
+        return {
+            restrict: 'E',
+            templateUrl: 'comment-reply.html',
+            scope: {
+                
+            },
+            link: function (scope, element, attr) {
+               
+            }
+        }
+                
+    }]);
+
+    ngApp.directive('commentReplyLink', ['$document', '$compile', function ($document, $compile) {
+        return { 
+            link: function (scope, element, attr) {
+                element.on('$destroy', function () {
+                    element.off('click');
+                    scope.$destroy(); 
+                });
+                
+                element.on('click', function () {
+                    var $container = element.parents('.comment-box').first();
+                    if (!$container.length) {
+                        console.error('commentReplyLink directive should be placed inside a container with class comment-box!');
+                        return;
+                    }
+                    if (attr.noCommentReplyDupe) {
+                        removeDupe();                    
+                    }
+                    var compiledHTML = $compile('<comment-reply></comment-reply>')(scope);
+                    $container.append(compiledHTML);
+                });
+            }
+        };
+        
+        
+        function removeDupe() {
+            let $existingElement = $document.find('comment-reply');
+            if (!$existingElement.length) {
+                return;
+            }
+            
+            $existingElement.remove();
+        }
+    }]);
 };