clone/logseq
1
0
Fork 0
mirror of https://github.com/logseq/logseq.git synced 2026-05-05 11:26:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into whiteboards

Browse Source
This commit is contained in:
Peng Xiao
2022-08-31 10:44:18 +08:00
parent 94e5c9d1a3 9a9e793177
commit f5d83483ce
12 changed files with 69 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/frontend/extensions/code.cljs
View File

@@ -173,10 +173,7 @@
(:file-path config)
(let [path (:file-path config)
content (db/get-file path)
[_ id _ _ _] (:rum/args state)
value (some-> (gdom/getElement id)
(gobj/get "value"))]
content (db/get-file path)]
(when (and
(not (string/blank? value))
(not= (string/trim value) (string/trim content)))
@@ -231,7 +228,7 @@
cm-options (merge default-cm-options
(extra-codemirror-options)
{:mode mode
:tabindex -1 ;; do not accept TAB-in, since TAB is bind globally
:tabIndex -1 ;; do not accept TAB-in, since TAB is bind globally
:extraKeys #js {"Esc" (fn [cm]
;; Avoid reentrancy
(gobj/set cm "escPressed" true)
@@ -254,7 +251,9 @@
(reset! (:calc-atom state) (calc/eval-lines new-code))))))
(.on editor "blur" (fn [cm e]
(when e (util/stop e))
(when-not (gobj/get cm "escPressed")
(when (or
(= :file (state/get-current-route))
(not (gobj/get cm "escPressed")))
(save-file-or-block-when-blur-or-esc! editor textarea config state))
(state/set-block-component-editing-mode! false)))
(.on editor "focus" (fn [_e]