pull/921/head
charlie 2020-12-14 14:33:05 +08:00 committed by Tienson Qin
parent 4b5eb4eb5a
commit 2e30872f61
2 changed files with 7 additions and 5 deletions

View File

@ -271,24 +271,26 @@
(do
(util/stop e)
(let [client-x (gobj/get e "clientX")
client-y (gobj/get e "clientY")]
client-y (gobj/get e "clientY")
scroll-y (util/cur-doc-top)]
(state/show-custom-context-menu! (block-context-menu-content target (cljs.core/uuid block-id)))
(when-let [context-menu (d/by-id "custom-context-menu")]
(d/set-style! context-menu
:left (str client-x "px")
:top (str client-y "px")))))
:top (str (+ scroll-y client-y) "px")))))
(and (state/in-selection-mode?)
(seq (state/get-selection-blocks)))
(do
(util/stop e)
(let [client-x (gobj/get e "clientX")
client-y (gobj/get e "clientY")]
client-y (gobj/get e "clientY")
scroll-y (util/cur-doc-top)]
(state/show-custom-context-menu! (custom-context-menu-content))
(when-let [context-menu (d/by-id "custom-context-menu")]
(d/set-style! context-menu
:left (str client-x "px")
:top (str client-y "px")))))
:top (str (+ scroll-y client-y) "px")))))
:else
nil))))))

View File

@ -311,7 +311,7 @@
(def moving-frequency 15)
(defn cur-doc-top []
(+ (.. js/document -body -scrollTop) (.. js/document -documentElement -scrollTop)))
(.. js/document -documentElement -scrollTop))
(defn element-top [elem top]
(when elem