Quellcode durchsuchen

fix: block reference ids

Tienson Qin vor 4 Jahren
Ursprung
Commit
b0e2aa6221

+ 14 - 12
src/main/frontend/date.cljs

@@ -190,18 +190,20 @@
        (valid? (util/capitalize-all title))))
 
 (defn journal-title->
-  [journal-title then-fn]
-  (when-not (string/blank? journal-title)
-    (when-let [time (->> (map
-                           (fn [formatter]
-                             (try
-                               (tf/parse (tf/formatter formatter) (util/capitalize-all journal-title))
-                               (catch js/Error _e
-                                 nil)))
-                           safe-journal-title-formatters)
-                         (filter some?)
-                         first)]
-      (then-fn time))))
+  ([journal-title then-fn]
+   (journal-title-> journal-title then-fn (journal-title-formatters)))
+  ([journal-title then-fn formatters]
+   (when-not (string/blank? journal-title)
+     (when-let [time (->> (map
+                            (fn [formatter]
+                              (try
+                                (tf/parse (tf/formatter formatter) (util/capitalize-all journal-title))
+                                (catch js/Error _e
+                                  nil)))
+                            formatters)
+                          (filter some?)
+                          first)]
+       (then-fn time)))))
 
 (defn journal-title->int
   [journal-title]

+ 2 - 2
src/main/frontend/handler/repo.cljs

@@ -329,11 +329,11 @@
               options {:first-clone? first-clone?
                        :delete-files (concat delete-files delete-pages)
                        :delete-blocks delete-blocks
-                       :re-render? true
-                       :refresh? true}]
+                       :re-render? true}]
           (if (seq nfs-files)
             (parse-files-and-load-to-db! repo-url nfs-files
                                          (assoc options
+                                                :refresh? refresh?
                                                 :re-render-opts {:clear-all-query-state? true}))
             (load-contents add-or-modify-files options)))))))
 

+ 1 - 1
src/main/frontend/handler/web/nfs.cljs

@@ -248,7 +248,7 @@
                       (repo-handler/load-repo-to-db! repo
                                                      {:diffs     diffs
                                                       :nfs-files modified-files
-                                                      :refresh? true}))))))))
+                                                      :refresh? (not re-index?)}))))))))
 
 (defn- reload-dir!
   ([repo]