Merge branch 'master' into feature/edit-link-headers

[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 06426bf349a0bfba4d9cda94ec06c769aa99e4b6..5688ebd61f3203b503ef2766233021368e334f98 100644 (file)
--- a/resources/assets/js/components/markdown-editor.js
+++ b/resources/assets/js/components/markdown-editor.js
@@ -18,6 +18,13 @@ class MarkdownEditor {
 
         this.onMarkdownScroll = this.onMarkdownScroll.bind(this);
         this.init();
+
+        // Scroll to text if needed.
+        const queryParams = (new URL(window.location)).searchParams;
+        const scrollText = queryParams.get('content-text');
+        if (scrollText) {
+            this.scrollToText(scrollText);
+        }
     }
 
     init() {
@@ -387,6 +394,38 @@ class MarkdownEditor {
         });
     }
 
+    // Scroll to a specified text
+    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;
+            }
+        }
+
+        if (lineNumber !== -1) {
+            this.cm.scrollIntoView({
+                line: lineNumber,
+            }, 200);
+            this.cm.focus();
+            // set the cursor location.
+            this.cm.setCursor({
+                line: lineNumber,
+                char: lines[lineNumber].length
+            })
+        }
+    }
+
 }
 
 module.exports = MarkdownEditor ;
\ No newline at end of file