Pārlūkot izejas kodu

fix: can't create org mode files in Canary release

close #1740
Tienson Qin 4 gadi atpakaļ
vecāks
revīzija
3ea88719db

+ 2 - 1
src/main/frontend/modules/file/core.cljs

@@ -99,7 +99,8 @@
 (defn- create-file-if-not-exists!
   [page ok-handler]
   (when-let [repo (state/get-current-repo)]
-    (let [format (name (get page :block/format :markdown))
+    (let [format (name (get page :block/format
+                            (state/get-preferred-format)))
           title (string/capitalize (:block/name page))
           journal-page? (date/valid-journal-title? title)
           path (str

+ 8 - 6
src/main/frontend/text.cljs

@@ -167,12 +167,6 @@
    (and (string? line)
         (re-find #"^\s*[^ ]+: " line))))
 
-(defn org-property?
-  [line]
-  (boolean
-   (and (string? line)
-        (re-find #"^\s*:[^: ]+: " line))))
-
 (defn get-property-key
   [line format]
   (and (string? line)
@@ -182,6 +176,14 @@
                          (re-find #"^\s*([^ ]+):: " line)))]
          (keyword key))))
 
+(defn org-property?
+  [line]
+  (boolean
+   (and (string? line)
+        (re-find #"^\s*:[^: ]+: " line)
+        (when-let [key (get-property-key line :org)]
+          (not (contains? #{:PROPERTIES :END} key))))))
+
 (defn remove-properties!
   [format content]
   (let [org? (= format :org)]