فهرست منبع

slight refactor for clarity

Mike Travers 3 سال پیش
والد
کامیت
6a48bbe08b
2فایلهای تغییر یافته به همراه18 افزوده شده و 16 حذف شده
  1. 4 1
      src/main/frontend/components/sidebar.cljs
  2. 14 15
      src/main/frontend/handler/route.cljs

+ 4 - 1
src/main/frontend/components/sidebar.cljs

@@ -245,7 +245,10 @@
             :active           (and (not srs-open?)
                                    (or (= route-name :all-journals) (= route-name :home)))
             :title            (t :left-side-bar/journals)
-            :on-click-handler route-handler/go-to-journals!
+            :on-click-handler (fn [e]
+                                (if (gobj/get e "shiftKey")
+                                  (route-handler/sidebar-journals!)
+                                  (route-handler/go-to-journals!)))
             :icon             "calendar"})))
 
         (when (state/enable-flashcards? (state/get-current-repo))

+ 14 - 15
src/main/frontend/handler/route.cljs

@@ -9,7 +9,6 @@
             [frontend.state :as state]
             [logseq.graph-parser.text :as text]
             [frontend.util :as util]
-            [goog.object :as gobj]
             [reitit.frontend.easy :as rfe]))
 
 (defn redirect!
@@ -137,21 +136,21 @@
     (state/set-search-mode! search-mode))
   (state/pub-event! [:go/search]))
 
+(defn sidebar-journals!
+  []
+  (state/sidebar-add-block!
+   (state/get-current-repo)
+   (:db/id (db/get-page (date/today)))
+   :page))
+
 (defn go-to-journals!
-  [e]
-  (if (gobj/get e "shiftKey")           ;TODO pretty sure this test should be sidebar.cljs
-    (do
-      (state/sidebar-add-block!
-       (state/get-current-repo)
-       (:db/id (db/get-page (date/today)))
-       :page))
-    (do
-      (state/set-journals-length! 3)
-      (let [route (if (state/custom-home-page?)
-                    :all-journals
-                    :home)]
-        (redirect! {:to route}))
-      (util/scroll-to-top))))
+  []
+  (state/set-journals-length! 3)
+  (let [route (if (state/custom-home-page?)
+                :all-journals
+                :home)]
+    (redirect! {:to route}))
+  (util/scroll-to-top))
 
 (defn- redirect-to-file!
   [page]