From fd00d86d6a84d9b18647d5ae1e279c3af0d9c204 Mon Sep 17 00:00:00 2001
From: Andelf <andelf@gmail.com>
Date: Tue, 11 Jan 2022 23:46:11 +0800
Subject: [PATCH 1/3] enhance(editor): allow edit markup files

---
 src/main/frontend/components/file.cljs | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/src/main/frontend/components/file.cljs b/src/main/frontend/components/file.cljs
index acfc06643..3c9ab2d4e 100644
--- a/src/main/frontend/components/file.cljs
+++ b/src/main/frontend/components/file.cljs
@@ -105,14 +105,6 @@
          (and format (contains? (config/img-formats) format))
          [:img {:src path}]
 
-         (and format (contains? config/markup-formats format))
-         (when-let [file-content (db/get-file path)]
-           (let [content (string/trim file-content)]
-             (content/content path {:config {:file? true
-                                             :file-path path}
-                                    :content content
-                                    :format format})))
-
          (and format (contains? (config/text-formats) format))
          (when-let [file-content (db/get-file path)]
            (let [content (string/trim file-content)

From 08ba5c7ff841942f131423fac6fa70acfafd9523 Mon Sep 17 00:00:00 2001
From: Tienson Qin <tiensonqin@gmail.com>
Date: Wed, 12 Jan 2022 10:24:05 +0800
Subject: [PATCH 2/3] fix: mage dragging to Logseq broken

close #3862
---
 src/main/frontend/components/sidebar.cljs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/frontend/components/sidebar.cljs b/src/main/frontend/components/sidebar.cljs
index 678ca4221..12b399203 100644
--- a/src/main/frontend/components/sidebar.cljs
+++ b/src/main/frontend/components/sidebar.cljs
@@ -292,7 +292,7 @@
 
 (rum/defc main <
   {:did-mount (fn [state]
-                (when-let [element (gdom/getElement "main-content")]
+                (when-let [element (gdom/getElement "main-content-container")]
                   (dnd/subscribe!
                    element
                    :upload-files

From 0f08340799d36f2b38e3e4177817700371331c57 Mon Sep 17 00:00:00 2001
From: Tienson Qin <tiensonqin@gmail.com>
Date: Wed, 12 Jan 2022 11:52:28 +0800
Subject: [PATCH 3/3] fix: pop up a saving confirmation dialog when losing
 focus

---
 src/main/frontend/extensions/code.cljs | 3 +--
 src/main/frontend/fs/node.cljs         | 4 ++--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/main/frontend/extensions/code.cljs b/src/main/frontend/extensions/code.cljs
index d88a564f9..518b4c818 100644
--- a/src/main/frontend/extensions/code.cljs
+++ b/src/main/frontend/extensions/code.cljs
@@ -183,8 +183,7 @@
             (file-handler/alter-file (state/get-current-repo)
                                      path
                                      (str (string/trim value) "\n")
-                                     {:re-render-root? true})
-            (notification/show! "Saved file!" :success)))
+                                     {:re-render-root? true})))
 
         :else
         nil))))
diff --git a/src/main/frontend/fs/node.cljs b/src/main/frontend/fs/node.cljs
index fda487ce8..1ef0fc0be 100644
--- a/src/main/frontend/fs/node.cljs
+++ b/src/main/frontend/fs/node.cljs
@@ -35,7 +35,7 @@
       (p/resolved (= (string/trim disk-content) (string/trim db-content))))))
 
 (defn- write-file-impl!
-  [this repo dir path content {:keys [ok-handler error-handler skip-compare?] :as opts} stat]
+  [this repo dir path content {:keys [ok-handler error-handler old-content skip-compare?] :as opts} stat]
   (if skip-compare?
     (p/catch
         (p/let [result (ipc/ipc "writeFile" repo path content)]
@@ -55,7 +55,7 @@
             ext (string/lower-case (util/get-file-ext path))
             file-page (db/get-file-page-id path)
             page-empty? (and file-page (db/page-empty? repo file-page))
-            db-content (or (db/get-file repo path) "")
+            db-content (or old-content (db/get-file repo path) "")
             contents-matched? (contents-matched? disk-content db-content)
             pending-writes (state/get-write-chan-length)]
       (cond