clone/logseq
1
0
Fork 0
mirror of https://github.com/logseq/logseq.git synced 2026-04-29 00:24:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into disable-webview-resize

Browse Source
This commit is contained in:
llcc
2022-05-09 19:44:40 +08:00
committed by GitHub
parent dbe08de6e4 e46452f6de
commit 628fd0f3e4
79 changed files with 676 additions and 367 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/main/frontend/handler/page.cljs
View File

@@ -33,6 +33,8 @@
[lambdaisland.glogi :as log]
[promesa.core :as p]
[frontend.mobile.util :as mobile-util]
[logseq.graph-parser.util :as gp-util]
[logseq.graph-parser.config :as gp-config]
[goog.functions :refer [debounce]]))
(defn- get-directory
@@ -47,7 +49,7 @@
(date/journal-title->default title)
(util/page-name-sanity (string/lower-case title)))]
;; Win10 file path has a length limit of 260 chars
(util/safe-subs s 0 200)))
(gp-util/safe-subs s 0 200)))
(defn get-page-file-path
([] (get-page-file-path (state/get-current-page)))
@@ -625,8 +627,8 @@
(->> (db/get-all-pages repo)
(remove (fn [p]
(let [name (:block/name p)]
(or (util/uuid-string? name)
(config/draw? name)
(or (gp-util/uuid-string? name)
(gp-config/draw? name)
(db/built-in-pages-names (string/upper-case name))))))
(common-handler/fix-pages-timestamps)))
@@ -669,17 +671,17 @@
q (or
@editor-handler/*selected-text
(when (state/sub :editor/show-page-search-hashtag?)
(util/safe-subs edit-content pos current-pos))
(gp-util/safe-subs edit-content pos current-pos))
(when (> (count edit-content) current-pos)
(util/safe-subs edit-content pos current-pos)))]
(gp-util/safe-subs edit-content pos current-pos)))]
(if (state/sub :editor/show-page-search-hashtag?)
(fn [chosen _click?]
(state/set-editor-show-page-search! false)
(let [wrapped? (= "[[" (util/safe-subs edit-content (- pos 2) pos))
(let [wrapped? (= "[[" (gp-util/safe-subs edit-content (- pos 2) pos))
chosen (if (string/starts-with? chosen "New page: ") ;; FIXME: What if a page named "New page: XXX"?
(subs chosen 10)
chosen)
chosen (if (and (util/safe-re-find #"\s+" chosen) (not wrapped?))
chosen (if (and (gp-util/safe-re-find #"\s+" chosen) (not wrapped?))
(util/format "[[%s]]" chosen)
chosen)
q (if @editor-handler/*selected-text "" q)