clone/logseq
1
0
Fork 0
mirror of https://github.com/logseq/logseq.git synced 2026-05-05 03:16:37 +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-09-01 10:29:29 +08:00
parent 930a48cf69 c45a15d576
commit 33885e619b
121 changed files with 6780 additions and 2084 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -209,7 +209,7 @@
(defn render!
[state]
(let [[config id attr _code theme] (:rum/args state)
(let [[config id attr _code theme user-options] (:rum/args state)
default-open? (and (:editor/code-mode? @state/state)
(= (:block/uuid (state/get-edit-block))
(get-in config [:block :block/uuid])))
@@ -238,7 +238,8 @@
(editor-handler/edit-block! block :max block-id))))}}
(when config/publishing?
{:readOnly true
:cursorBlinkRate -1}))
:cursorBlinkRate -1})
user-options)
editor (when textarea
(from-textarea textarea (clj->js cm-options)))]
(when editor

4
src/main/frontend/extensions/zotero.cljs
View File

@@ -107,14 +107,14 @@
:on-click
(fn []
(set! (.-scrollTop (.-parentNode (gdom/getElement "zotero-search"))) 0)
(go (<! (search-fn prev-search-term prev-page))))))
(search-fn prev-search-term prev-page))))
(when-not (str/blank? next-page)
(ui/button
"next"
:on-click
(fn []
(set! (.-scrollTop (.-parentNode (gdom/getElement "zotero-search"))) 0)
(go (<! (search-fn prev-search-term next-page))))))]]))
(search-fn prev-search-term next-page))))]]))
(rum/defcs user-or-group-setting <
(rum/local (setting/setting :type-id) ::type-id)