Browse Source

fix: tags with a comma are not working inside blocks (inline tags)

Related to #1144
Tienson Qin 4 years ago
parent
commit
cdf9492357
3 changed files with 16 additions and 16 deletions
  1. 1 1
      package.json
  2. 11 11
      src/main/frontend/components/block.cljs
  3. 4 4
      yarn.lock

+ 1 - 1
package.json

@@ -55,7 +55,7 @@
         "gulp-cached": "^1.1.1",
         "ignore": "^5.1.8",
         "jszip": "^3.5.0",
-        "mldoc": "^0.3.3",
+        "mldoc": "^0.3.7",
         "mousetrap": "^1.6.5",
         "react": "^17.0.1",
         "react-dom": "^17.0.1",

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

@@ -555,17 +555,17 @@
     (->elem :sub (map-inline config l))
     ["Tag" s]
     (if (and s (util/tag-valid? s))
-      [:a.tag.mr-1 {:href (rfe/href :page {:name s})
-                    :on-click (fn [e]
-                                (.preventDefault e)
-                                (let [repo (state/get-current-repo)
-                                      page (db/pull repo '[*] [:page/name (string/lower-case (util/url-decode s))])]
-                                  (when (gobj/get e "shiftKey")
-                                    (state/sidebar-add-block!
-                                     repo
-                                     (:db/id page)
-                                     :page
-                                     {:page page}))))}
+      [:a.tag {:href (rfe/href :page {:name s})
+               :on-click (fn [e]
+                           (.preventDefault e)
+                           (let [repo (state/get-current-repo)
+                                 page (db/pull repo '[*] [:page/name (string/lower-case (util/url-decode s))])]
+                             (when (gobj/get e "shiftKey")
+                               (state/sidebar-add-block!
+                                repo
+                                (:db/id page)
+                                :page
+                                {:page page}))))}
        (str "#" s)]
       [:span.warning.mr-1 {:title "Invalid tag, tags only accept alphanumeric characters, \"-\", \"_\", \"@\" and \"%\"."}
        (str "#" s)])

+ 4 - 4
yarn.lock

@@ -3628,10 +3628,10 @@ mkdirp@~0.5.1:
   dependencies:
     minimist "^1.2.5"
 
-mldoc@^0.3.3:
-  version "0.3.3"
-  resolved "https://registry.yarnpkg.com/mldoc/-/mldoc-0.3.3.tgz#e02b97d82f0907432d8db10e958d7f02a9a806ff"
-  integrity sha512-NdksPLmtW8fe6fG/54Wy7WCaDWEpGrxgi6jsAci/CdnuTvWZKwmSYajoTVBBzyN9RmvY+6Sib3mbxorfxEvhSQ==
+mldoc@^0.3.7:
+  version "0.3.7"
+  resolved "https://registry.yarnpkg.com/mldoc/-/mldoc-0.3.7.tgz#08f0ff51ab223d47279beadf89d70fbb238164ff"
+  integrity sha512-vnZqOrCE/JnDyy14zTxHE0KfSpRS/nu4+EuySpomHhWQYiBJ30dv0QhAvNW3XoX/kz8O0bVopFOAPPCCEb1MOQ==
   dependencies:
     yargs "^12.0.2"