Merge branch 'fix/ru-locale' of git://github.com/mullinsmikey/BookStack into mullinsm...

[bookstack] / resources / assets / js / components / markdown-editor.js

diff --git a/resources/assets/js/components/markdown-editor.js b/resources/assets/js/components/markdown-editor.js
index 4e0ba83baadd4fe3eb18607b90b93caa86e82806..a555376e8eaca5094620b3c3fe03a68824c8acca 100644 (file)
--- a/resources/assets/js/components/markdown-editor.js
+++ b/resources/assets/js/components/markdown-editor.js
@@ -8,6 +8,7 @@ class MarkdownEditor {
 
     constructor(elem) {
         this.elem = elem;
+        this.textDirection = document.getElementById('page-editor').getAttribute('text-direction');
         this.markdown = new MarkdownIt({html: true});
         this.markdown.use(mdTasksLists, {label: true});
 
@@ -98,6 +99,9 @@ class MarkdownEditor {
 
     codeMirrorSetup() {
         let cm = this.cm;
+        // Text direction
+        // cm.setOption('direction', this.textDirection);
+        cm.setOption('direction', 'ltr'); // Will force to remain as ltr for now due to issues when HTML is in editor.
         // Custom key commands
         let metaKey = code.getMetaKey();
         const extraKeys = {};
@@ -395,31 +399,30 @@ class MarkdownEditor {
     }
 
     // Scroll to a specified text
-    scrollToText(searchText) {;
+    scrollToText(searchText) {
         if (!searchText) {
             return;
         }
+
         const content = this.cm.getValue();
         const lines = content.split(/\r?\n/);
-        let lineNumber = -1;
-        for (let i = 0; i !== lines.length; ++i) {
-            const line = lines[i];
-            if (!line) {
-                continue;
-            }
-            if (line.indexOf(searchText) !== -1) {
-                lineNumber = i;
-                break;
-            }
-        }
+        let lineNumber = lines.findIndex(line => {
+            return line && line.indexOf(searchText) !== -1;
+        });
 
-        if (lineNumber !== -1) {
-            this.cm.scrollIntoView({
-                line: lineNumber,
-                char: lines[lineNumber].length
-            }, 200);
-            this.cm.focus();
+        if (lineNumber === -1) {
+            return;
         }
+
+        this.cm.scrollIntoView({
+            line: lineNumber,
+        }, 200);
+        this.cm.focus();
+        // set the cursor location.
+        this.cm.setCursor({
+            line: lineNumber,
+            char: lines[lineNumber].length
+        })
     }
 
 }