Browse Source

fix: incorrect page title when 'hls__' is opened (#8697)

* dev: move 'hls-file?' to pdf-utils
* dev: use 'hls-file?' instead of string comparison
* fix: window title when hls file opened
Adam 2 years ago
parent
commit
6f45107408

+ 1 - 1
src/main/frontend/components/block.cljs

@@ -572,7 +572,7 @@
                        (t :untitled)
 
                        ;; The page-name-in-block generated by the auto-complete is not page-name-sanitized
-                       (string/starts-with? page-name "hls__")
+                       (pdf-utils/hls-file? page-name)
                        (pdf-utils/fix-local-asset-pagename page-name)
 
                        (not= (util/safe-page-name-sanity-lc original-name) page-name-in-block)

+ 1 - 2
src/main/frontend/components/page.cljs

@@ -15,7 +15,6 @@
             [frontend.db-mixins :as db-mixins]
             [frontend.db.model :as model]
             [frontend.extensions.graph :as graph]
-            [frontend.extensions.pdf.assets :as pdf-assets]
             [frontend.extensions.pdf.utils :as pdf-utils]
             [frontend.format.block :as block]
             [frontend.handler.common :as common-handler]
@@ -296,7 +295,7 @@
           *edit? (get state ::edit?)
           *input-value (get state ::input-value)
           repo (state/get-current-repo)
-          hls-page? (pdf-assets/hls-file? title)
+          hls-page? (pdf-utils/hls-file? title)
           whiteboard-page? (model/whiteboard-page? page-name)
           untitled? (and whiteboard-page? (parse-uuid page-name)) ;; normal page cannot be untitled right?
           title (if hls-page?

+ 0 - 4
src/main/frontend/extensions/pdf/assets.cljs

@@ -25,10 +25,6 @@
             [reitit.frontend.easy :as rfe]
             [rum.core :as rum]))
 
-(defn hls-file?
-  [filename]
-  (and filename (string? filename) (string/starts-with? filename "hls__")))
-
 (defn inflate-asset
   [original-path]
   (let [filename  (util/node-path.basename original-path)

+ 5 - 1
src/main/frontend/extensions/pdf/utils.cljs

@@ -11,6 +11,10 @@
 (defonce MIN-SCALE 0.25)
 (defonce DELTA_SCALE 1.05)
 
+(defn hls-file?
+  [filename]
+  (and filename (string? filename) (string/starts-with? filename "hls__")))
+
 (defn clean-asset-path-prefix
   [path]
   (when (string? path)
@@ -177,7 +181,7 @@
   [filename]
   (when-not (string/blank? filename)
     (let [local-asset? (re-find #"[0-9]{13}_\d$" filename)
-          hls?         (re-find #"^hls__" filename)
+          hls?         (hls-file? filename)
           len          (count filename)]
       (if (or local-asset? hls?)
         (-> filename

+ 4 - 2
src/main/frontend/handler/route.cljs

@@ -10,6 +10,7 @@
             [frontend.handler.ui :as ui-handler]
             [frontend.state :as state]
             [frontend.util :as util]
+            [frontend.extensions.pdf.utils :as pdf-utils]
             [logseq.graph-parser.text :as text]
             [reitit.frontend.easy :as rfe]
             [frontend.context.i18n :refer [t]]))
@@ -143,8 +144,9 @@
 (defn update-page-title!
   [route]
   (let [{:keys [data path-params]} route
-        title (get-title (:name data) path-params)]
-    (util/set-title! title)))
+        title (get-title (:name data) path-params)
+        hls? (pdf-utils/hls-file? title)]
+    (util/set-title! (if hls? (pdf-utils/fix-local-asset-pagename title) title))))
 
 (defn update-page-label!
   [route]