Parcourir la source

enhance: display pdf by default

Tienson Qin il y a 4 ans
Parent
commit
bb1540a8fa

+ 7 - 6
src/main/frontend/handler/editor.cljs

@@ -1295,12 +1295,13 @@
 
 (defn- get-asset-file-link
   [format url file-name image?]
-  (case (keyword format)
-    :markdown (util/format (str (when image? "!") "[%s](%s)") file-name url)
-    :org (if image?
-           (util/format "[[%s]]" url)
-           (util/format "[[%s][%s]]" url file-name))
-    nil))
+  (let [pdf? (and url (string/ends-with? url ".pdf"))]
+    (case (keyword format)
+      :markdown (util/format (str (when (or image? pdf?) "!") "[%s](%s)") file-name url)
+      :org (if image?
+             (util/format "[[%s]]" url)
+             (util/format "[[%s][%s]]" url file-name))
+      nil)))
 
 (defn- get-asset-link
   [url]

+ 5 - 2
src/main/frontend/handler/editor/lifecycle.cljs

@@ -50,8 +50,11 @@
       ;; (.removeEventListener input "paste" (fn [event]
       ;;                                       (append-paste-doc! format event)))
       (let [s (str "cljs-drag-n-drop." :upload-images)
-            element (gdom/getElement "main-content")]
-        (dnd/unsubscribe! element :upload-files)))
+            element (gdom/getElement "main-content")
+            a (gobj/get element s)
+            timer (:timer a)]
+        (when (and element timer)
+          (dnd/unsubscribe! element :upload-files))))
     (editor-handler/clear-when-saved!)
     ;; TODO: ugly
     (when-not (contains? #{:insert :indent-outdent :auto-save :undo :redo :delete} (state/get-editor-op))