Merge remote-tracking branch 'upstream/master' into whiteboards

This commit is contained in:
Peng Xiao
2022-08-05 13:59:06 +08:00
80 changed files with 1789 additions and 1303 deletions

View File

@@ -38,20 +38,19 @@
(defn redirect-to-page!
"Must ensure `page-name` is dereferenced (not an alias), or it will create a wrong new page with that name (#3511)."
([page-name]
(recent-handler/add-page-to-recent! (state/get-current-repo) page-name)
(redirect! {:to :page
:path-params {:name (str page-name)}}))
([page-name anchor]
(recent-handler/add-page-to-recent! (state/get-current-repo) page-name)
(redirect! {:to :page
:path-params {:name (str page-name)}
:query-params {:anchor anchor}}))
([page-name anchor push]
(recent-handler/add-page-to-recent! (state/get-current-repo) page-name)
(redirect! {:to :page
:path-params {:name (str page-name)}
:query-params {:anchor anchor}
:push push})))
(redirect-to-page! page-name {}))
([page-name {:keys [anchor push click-from-recent?]
:or {click-from-recent? false}}]
(recent-handler/add-page-to-recent! (state/get-current-repo) page-name
click-from-recent?)
(let [m (cond->
{:to :page
:path-params {:name (str page-name)}}
anchor
(assoc :query-params {:anchor anchor})
push
(assoc :push push))]
(redirect! m))))
(defn redirect-to-whiteboard!
([name]