From 76dce5197f6ec99dcf4854032f967dd5c72a9e4a Mon Sep 17 00:00:00 2001
From: zadam <zadam.apps@gmail.com>
Date: Mon, 2 Sep 2019 21:23:55 +0200
Subject: [PATCH] fix inline markdown import dialog

---
 src/public/javascripts/desktop.js                 | 7 +++++++
 src/public/javascripts/dialogs/markdown_import.js | 7 ++-----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/public/javascripts/desktop.js b/src/public/javascripts/desktop.js
index c7ce664e3..30ef34d6b 100644
--- a/src/public/javascripts/desktop.js
+++ b/src/public/javascripts/desktop.js
@@ -159,6 +159,13 @@ $('[data-toggle="tooltip"]').tooltip({
     html: true
 });
 
+// for CKEditor integration (button on block toolbar)
+window.glob.importMarkdownInline = async () => {
+    const dialog = await import("./dialogs/markdown_import.js");
+
+    dialog.importMarkdownInline();
+};
+
 macInit.init();
 
 searchNotesService.init(); // should be in front of treeService since that one manipulates address bar hash
diff --git a/src/public/javascripts/dialogs/markdown_import.js b/src/public/javascripts/dialogs/markdown_import.js
index 1a1e2e36a..f56c77952 100644
--- a/src/public/javascripts/dialogs/markdown_import.js
+++ b/src/public/javascripts/dialogs/markdown_import.js
@@ -33,8 +33,6 @@ export async function importMarkdownInline() {
         convertMarkdownToHtml(text);
     }
     else {
-        $("input[name='search-text']").focus();
-
         glob.activeDialog = $dialog;
 
         $dialog.modal();
@@ -53,7 +51,6 @@ async function sendForm() {
 
 $importButton.click(sendForm);
 
-utils.bindElShortcut($dialog, 'ctrl+return', sendForm);
+$dialog.on('shown.bs.modal', () => $importTextarea.focus());
 
-// for CKEditor integration (button on block toolbar)
-window.glob.importMarkdownInline = importMarkdownInline;
\ No newline at end of file
+utils.bindElShortcut($dialog, 'ctrl+return', sendForm);
\ No newline at end of file