1
0
Tienson Qin 4 жил өмнө
parent
commit
093faa1687

+ 2 - 2
src/main/frontend/components/block.cljs

@@ -1181,7 +1181,7 @@
           only-title? (and (= 1 (count ast))
                            (= "Properties" (ffirst ast))
                            (let [m (second (first ast))]
-                             (every? #(util/in? % [:title :filter]) (keys m))))
+                             (every? #(contains? #{:title :filters} %) (keys m))))
           block-cp [:div {:class (if only-title?
                                    (util/hiccup->class "pre-block.opacity-50")
                                    (util/hiccup->class "pre-block.bg-base-2.p-2.rounded"))}
@@ -1841,7 +1841,7 @@
          (for [[k v] (dissoc m :roam_alias :roam_tags)]
            (when (and (not (and (= k :macros) (empty? v))) ; empty macros
                       (not (= k :title))
-                      (not (= k :filter)))
+                      (not (= k :filters)))
              [:div.property
               [:span.font-medium.mr-1 (str (name k) ": ")]
               (if (coll? v)

+ 1 - 2
src/main/frontend/handler/block.cljs

@@ -145,8 +145,7 @@
   (when-let [block (db/entity repo [:block/uuid block-id])]
     (let [properties (:page/properties (:block/page block))
           property-names (keys properties)]
-      (and (every? #(util/in? % '(:title :filter)) property-names)
-           (= 1 (count properties))
+      (and (every? #(contains? #{:title :filters} %) property-names)
            (let [ast (mldoc/->edn (:block/content block) (mldoc/default-config (:block/format block)))]
              (or
               (empty? (rest ast))

+ 3 - 3
src/main/frontend/handler/page.cljs

@@ -520,13 +520,13 @@
 (defn save-filter!
   [page-name filter-state]
   (if (empty? filter-state)
-    (page-remove-property! page-name "filter")
-    (page-add-properties! page-name {"filter" filter-state})))
+    (page-remove-property! page-name "filters")
+    (page-add-properties! page-name {"filters" filter-state})))
 
 (defn get-filter
   [page-name]
   (let [properties (db/get-page-properties page-name)]
-    (atom (reader/read-string (get-in properties [:filter] "{}")))))
+    (atom (reader/read-string (get-in properties [:filters] "{}")))))
 
 (defn page-exists?
   [page-name]

+ 0 - 6
src/main/frontend/util.cljc

@@ -1151,12 +1151,6 @@
      []
      (contains? (set (system-locales)) "zh-CN")))
 
-;; Modified from https://stackoverflow.com/a/3249777/8213163
-(defn in?
-  "true if coll contains elm"
-  [elm coll]
-  (true? (some #(= elm %) coll)))
-
 (comment
   (= (get-relative-path "journals/2020_11_18.org" "pages/grant_ideas.org")
      "../pages/grant_ideas.org")