From d5d7c1f00798cead7543b908269b4a9a4759ddc5 Mon Sep 17 00:00:00 2001 From: leizhe Date: Sat, 11 Sep 2021 08:16:08 +0900 Subject: [PATCH] move command to text.cljs --- src/main/frontend/components/block.cljs | 3 +-- src/main/frontend/handler/extract.cljs | 7 ------- src/main/frontend/text.cljs | 8 ++++++++ 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/main/frontend/components/block.cljs b/src/main/frontend/components/block.cljs index 957c0588f..adfca0cba 100644 --- a/src/main/frontend/components/block.cljs +++ b/src/main/frontend/components/block.cljs @@ -31,7 +31,6 @@ [frontend.components.plugins :as plugins] [frontend.handler.plugin :as plugin-handler] [frontend.handler.block :as block-handler] - [frontend.handler.extract :as extract] [frontend.handler.dnd :as dnd] [frontend.handler.editor :as editor-handler] [frontend.handler.repeated :as repeated] @@ -1165,7 +1164,7 @@ (and (string/starts-with? a "[[") (string/ends-with? a "]]")) - (let [page-name (extract/extract-page-name-from-ref a)] + (let [page-name (text/extract-page-name-from-ref a)] (when-not (string/blank? page-name) (page-embed config page-name))) diff --git a/src/main/frontend/handler/extract.cljs b/src/main/frontend/handler/extract.cljs index 1dc759247..6fd53bdba 100644 --- a/src/main/frontend/handler/extract.cljs +++ b/src/main/frontend/handler/extract.cljs @@ -51,13 +51,6 @@ (or first-block-name file-name) (or file-name first-block-name))))))) -(defn extract-page-name-from-ref - [ref] - (when-not (string/blank? ref) - (if-let [matches (or (re-matches #"\[\[file:.+\]\[(.+)\]\]" ref) - (re-matches #"\[\[(.+)\]\]" ref))] - (string/trim (last matches)) - ref))) ;; TODO: performance improvement (defn- extract-pages-and-blocks diff --git a/src/main/frontend/text.cljs b/src/main/frontend/text.cljs index 3691f1d87..c23d04ce1 100644 --- a/src/main/frontend/text.cljs +++ b/src/main/frontend/text.cljs @@ -19,6 +19,14 @@ (string/starts-with? s "((") (string/ends-with? s "))"))) +(defn extract-page-name-from-ref + [ref] + (when-not (string/blank? ref) + (if-let [matches (or (re-matches #"\[\[file:.+\]\[(.+)\]\]" ref) + (re-matches #"\[\[(.+)\]\]" ref))] + (string/trim (last matches)) + ref))) + (defonce page-ref-re #"\[\[(.*?)\]\]") (defonce page-ref-re-2 #"(\[\[.*?\]\])")