#47 - Fixes the issues with the test case.

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

diff --git a/resources/assets/js/directives.js b/resources/assets/js/directives.js
index 6c556acc90c9f2143c79577b5b6edcef37b73fcc..16d1ad2a4fe1be758f57cc24ac0a2b286275b509 100644 (file)
--- a/resources/assets/js/directives.js
+++ b/resources/assets/js/directives.js
@@ -2,6 +2,7 @@
 const DropZone = require("dropzone");
 const MarkdownIt = require("markdown-it");
 const mdTasksLists = require('markdown-it-task-lists');
 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) {
 
 
 module.exports = function (ngApp, events) {
 


@@ -233,19 +234,41 @@ module.exports = function (ngApp, events) {
 
                 // Set initial model content
                 element = element.find('textarea').first();
 
                 // Set initial model content
                 element = element.find('textarea').first();

-                let content = element.val();
-                scope.mdModel = content;
-                scope.mdChange(md.render(content));

 
 

-                element.on('change input', (event) => {
-                    content = element.val();
+                // Codemirror Setup
+                let cm = code.markdownEditor(element[0]);
+                cm.on('change', (instance, changeObj) => {
+                    update(instance);
+                });
+
+                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);
+                });
+
+                function update(instance) {
+                    let content = instance.getValue();
+                    element.val(content);

                     $timeout(() => {
                         scope.mdModel = content;
                         scope.mdChange(md.render(content));
                     });
                     $timeout(() => {
                         scope.mdModel = content;
                         scope.mdChange(md.render(content));
                     });

-                });
+                }
+                update(cm);

 
                 scope.$on('markdown-update', (event, value) => {
 
                 scope.$on('markdown-update', (event, value) => {

+                    cm.setValue(value);

                     element.val(value);
                     scope.mdModel = value;
                     scope.mdChange(md.render(value));
                     element.val(value);
                     scope.mdModel = value;
                     scope.mdChange(md.render(value));


@@ -259,7 +282,7 @@ module.exports = function (ngApp, events) {
      * Markdown Editor
      * Handles all functionality of the markdown editor.
      */
      * 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) {
         return {
             restrict: 'A',
             link: function (scope, element, attrs) {


@@ -282,34 +305,15 @@ module.exports = function (ngApp, events) {
                     currentCaretPos = $input[0].selectionStart;
                 });
 
                     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()
+                // 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'});

                     }
                     }

-                    let scrollPercent = ($input.scrollTop() / (inputScrollHeight - inputHeight));
-                    let displayScrollY = (displayScrollHeight - displayHeight) * scrollPercent;
-                    $display.scrollTop(displayScrollY);
-                    lastScroll = now;

                 });
 
                 // Editor key-presses
                 });
 
                 // Editor key-presses


@@ -825,19 +829,25 @@ module.exports = function (ngApp, events) {
             templateUrl: 'comment-reply.html',
             scope: {
               pageId: '=',
             templateUrl: 'comment-reply.html',
             scope: {
               pageId: '=',

-              parentId: '='
+              parentId: '=',
+              parent: '='

             },
             link: function (scope, element) {
                 scope.isReply = true;
             },
             link: function (scope, element) {
                 scope.isReply = true;

+                element.find('textarea').focus();

                 scope.$on('evt.comment-success', function (event) {
                     // no need for the event to do anything more.
                     event.stopPropagation();
                     event.preventDefault();
                 scope.$on('evt.comment-success', function (event) {
                     // no need for the event to do anything more.
                     event.stopPropagation();
                     event.preventDefault();

+                    scope.closeBox();
+                });
+
+                scope.closeBox = function () {

                     element.remove();
                     scope.$destroy();
                     element.remove();
                     scope.$destroy();

-                });
+                };

             }
             }

-        }
+        };

     }]);
 
     ngApp.directive('commentEdit', [function () {
     }]);
 
     ngApp.directive('commentEdit', [function () {


@@ -845,25 +855,30 @@ module.exports = function (ngApp, events) {
             restrict: 'E',
             templateUrl: 'comment-reply.html',
             scope: {
             restrict: 'E',
             templateUrl: 'comment-reply.html',
             scope: {

-              comment: '=',
+              comment: '='

             },
             link: function (scope, element) {
                 scope.isEdit = true;
             },
             link: function (scope, element) {
                 scope.isEdit = true;

+                element.find('textarea').focus();

                 scope.$on('evt.comment-success', function (event, commentId) {
                    // no need for the event to do anything more.
                    event.stopPropagation();
                    event.preventDefault();
                    if (commentId === scope.comment.id && !scope.isNew) {
                 scope.$on('evt.comment-success', function (event, commentId) {
                    // no need for the event to do anything more.
                    event.stopPropagation();
                    event.preventDefault();
                    if (commentId === scope.comment.id && !scope.isNew) {

-                       element.remove();
-                       scope.$destroy();
+                       scope.closeBox();

                    }
                 });
                    }
                 });

+
+                scope.closeBox = function () {
+                    element.remove();
+                    scope.$destroy();
+                };

             }
             }

-        }
+        };

     }]);
 
 
     }]);
 
 

-    ngApp.directive('commentReplyLink', ['$document', '$compile', '$http', function ($document, $compile, $http) {
+    ngApp.directive('commentReplyLink', ['$document', '$compile', function ($document, $compile) {

         return {
             scope: {
                 comment: '='
         return {
             scope: {
                 comment: '='


@@ -874,8 +889,9 @@ module.exports = function (ngApp, events) {
                     scope.$destroy();
                 });
 
                     scope.$destroy();
                 });
 

-                element.on('click', function () {
-                    var $container = element.parents('.comment-box').first();
+                element.on('click', function (e) {
+                    e.preventDefault();
+                    var $container = element.parents('.comment-actions').first();

                     if (!$container.length) {
                         console.error('commentReplyLink directive should be placed inside a container with class comment-box!');
                         return;
                     if (!$container.length) {
                         console.error('commentReplyLink directive should be placed inside a container with class comment-box!');
                         return;


@@ -892,7 +908,7 @@ module.exports = function (ngApp, events) {
         function compileHtml($container, scope, isReply) {
             let lnkFunc = null;
             if (isReply) {
         function compileHtml($container, scope, isReply) {
             let lnkFunc = null;
             if (isReply) {

-                lnkFunc = $compile('<comment-reply page-id="comment.pageId" parent-id="comment.id"></comment-reply>');
+                lnkFunc = $compile('<comment-reply page-id="comment.pageId" parent-id="comment.id" parent="comment"></comment-reply>');

             } else {
                 lnkFunc = $compile('<comment-edit comment="comment"></comment-add>');
             }
             } else {
                 lnkFunc = $compile('<comment-edit comment="comment"></comment-add>');
             }


@@ -901,7 +917,7 @@ module.exports = function (ngApp, events) {
         }
 
         function removeDupe() {
         }
 
         function removeDupe() {

-            let $existingElement = $document.find('.comments-list comment-reply');
+            let $existingElement = $document.find('.comments-list comment-reply, .comments-list comment-edit');

             if (!$existingElement.length) {
                 return;
             }
             if (!$existingElement.length) {
                 return;
             }


@@ -909,4 +925,25 @@ module.exports = function (ngApp, events) {
             $existingElement.remove();
         }
     }]);
             $existingElement.remove();
         }
     }]);

+
+    ngApp.directive('commentDeleteLink', ['$window', function ($window) {
+        return {
+            controller: 'CommentDeleteController',
+            scope: {
+                comment: '='
+            },
+            link: function (scope, element, attr, ctrl) {
+
+                element.on('click', function(e) {
+                    e.preventDefault();
+                    var resp = $window.confirm(trans('entities.comment_delete_confirm'));
+                    if (!resp) {
+                        return;
+                    }
+
+                    ctrl.delete(scope.comment);
+                });
+            }
+        };
+    }]);

 };
 };