From 80bfc4105ef0202b3df668bad051cec974c4c16e Mon Sep 17 00:00:00 2001
From: leizhe <lzhes43@gmail.com>
Date: Mon, 30 Aug 2021 20:36:43 +0900
Subject: [PATCH] feat(clock): add markdown support

---
 src/main/frontend/components/block.cljs | 13 ----------
 src/main/frontend/handler/editor.cljs   | 32 ++++++++++++-------------
 2 files changed, 15 insertions(+), 30 deletions(-)

diff --git a/src/main/frontend/components/block.cljs b/src/main/frontend/components/block.cljs
index a36f268ba..fc37d195c 100644
--- a/src/main/frontend/components/block.cljs
+++ b/src/main/frontend/components/block.cljs
@@ -1846,19 +1846,6 @@
 
         (when (and (= (:block/marker block) "DONE")
                    (state/enable-timetracking?))
-          (let [start-time (or
-                            (get properties :now)
-                            (get properties :doing)
-                            (get properties :in-progress)
-                            (get properties :later)
-                            (get properties :todo))
-                finish-time (get properties :done)]
-            (when (and start-time finish-time (> finish-time start-time))
-              [:div.text-sm.time-spent.ml-1 {:title (str (date/int->local-time start-time) " ~ " (date/int->local-time finish-time))
-                                             :style {:padding-top 3}}
-               [:a.opacity-30.hover:opacity-100
-                (utils/timeConversion (- finish-time start-time))]]))
-
           (let [summary (clock/clock-summary format content)]
             (when summary
               [:div.text-sm.time-spent.ml-1 {:title "org-clock-summary"
diff --git a/src/main/frontend/handler/editor.cljs b/src/main/frontend/handler/editor.cljs
index 212d4006a..24f79eecf 100644
--- a/src/main/frontend/handler/editor.cljs
+++ b/src/main/frontend/handler/editor.cljs
@@ -782,23 +782,21 @@
   (if (state/enable-timetracking?)
     (let [new-marker (string/lower-case new-marker)
           old-marker (when old-marker (string/lower-case old-marker))]
-      (if (= :org format)
-        (when old-marker
-          (cond
-            (and (= old-marker "todo") (= new-marker "doing"))
-            (clock/clock-in format content)
-            (and (= old-marker "doing") (= new-marker "todo"))
-            (clock/clock-out format content)
-            (and (= old-marker "later") (= new-marker "now"))
-            (clock/clock-in format content)
-            (and (= old-marker "now") (= new-marker "later"))
-            (clock/clock-out format content)
-            (and (contains? #{"now" "doing"} old-marker)
-                 (= new-marker "done"))
-            (clock/clock-out format content)
-            :else
-            content))
-        (property/insert-property format content new-marker (util/time-ms))))
+      (when old-marker
+        (cond
+          (and (= old-marker "todo") (= new-marker "doing"))
+          (clock/clock-in format content)
+          (and (= old-marker "doing") (= new-marker "todo"))
+          (clock/clock-out format content)
+          (and (= old-marker "later") (= new-marker "now"))
+          (clock/clock-in format content)
+          (and (= old-marker "now") (= new-marker "later"))
+          (clock/clock-out format content)
+          (and (contains? #{"now" "doing"} old-marker)
+               (= new-marker "done"))
+          (clock/clock-out format content)
+          :else
+          content)))
     content))
 
 (defn check