|
@@ -530,27 +530,28 @@
|
|
|
(defn open-page-ref
|
|
|
[e page-name redirect-page-name page-name-in-block contents-page? whiteboard-page?]
|
|
|
(util/stop e)
|
|
|
- (cond
|
|
|
- (gobj/get e "shiftKey")
|
|
|
- (when-let [page-entity (db/entity [:block/name redirect-page-name])]
|
|
|
- (state/sidebar-add-block!
|
|
|
- (state/get-current-repo)
|
|
|
- (:db/id page-entity)
|
|
|
- :page))
|
|
|
+ (when (not (util/right-click? e))
|
|
|
+ (cond
|
|
|
+ (gobj/get e "shiftKey")
|
|
|
+ (when-let [page-entity (db/entity [:block/name redirect-page-name])]
|
|
|
+ (state/sidebar-add-block!
|
|
|
+ (state/get-current-repo)
|
|
|
+ (:db/id page-entity)
|
|
|
+ :page))
|
|
|
|
|
|
- (whiteboard-handler/inside-portal? (.-target e))
|
|
|
- (whiteboard-handler/add-new-block-portal-shape!
|
|
|
- page-name
|
|
|
- (whiteboard-handler/closest-shape (.-target e)))
|
|
|
+ (whiteboard-handler/inside-portal? (.-target e))
|
|
|
+ (whiteboard-handler/add-new-block-portal-shape!
|
|
|
+ page-name
|
|
|
+ (whiteboard-handler/closest-shape (.-target e)))
|
|
|
|
|
|
- whiteboard-page?
|
|
|
- (route-handler/redirect-to-whiteboard! page-name)
|
|
|
+ whiteboard-page?
|
|
|
+ (route-handler/redirect-to-whiteboard! page-name)
|
|
|
|
|
|
- (not= redirect-page-name page-name)
|
|
|
- (route-handler/redirect-to-page! redirect-page-name)
|
|
|
+ (not= redirect-page-name page-name)
|
|
|
+ (route-handler/redirect-to-page! redirect-page-name)
|
|
|
|
|
|
- :else
|
|
|
- (state/pub-event! [:page/create page-name-in-block]))
|
|
|
+ :else
|
|
|
+ (state/pub-event! [:page/create page-name-in-block])))
|
|
|
(when (and contents-page?
|
|
|
(util/mobile?)
|
|
|
(state/get-left-sidebar-open?))
|