Penpot/penpot
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-03-18 10:41:29 -05:00
Code Issues Activity

🐛 Fix exception on copy action from context menu.

Browse source
This commit is contained in:
Andrey Antukh 2020-12-21 15:32:36 +01:00 • committed by Alonso Torres
parent b4b88bde0b
commit dea5cf4b5d
3 changed files with 10 additions and 8 deletions
frontend
deps.edn
src/app/main
ui.cljs
ui/workspace
context_menu.cljs

2
frontend/deps.edn
View file

@ -14,7 +14,7 @@
funcool/beicon {:mvn/version "2020.12.20-1"} funcool/beicon {:mvn/version "2020.12.20-1"}
funcool/cuerdas {:mvn/version "2020.03.26-3"} funcool/cuerdas {:mvn/version "2020.03.26-3"}
funcool/okulary {:mvn/version "2020.04.14-0"} funcool/okulary {:mvn/version "2020.04.14-0"}
funcool/potok {:mvn/version "3.0.0"} funcool/potok {:mvn/version "3.1.0"}
funcool/promesa {:mvn/version "6.0.0"} funcool/promesa {:mvn/version "6.0.0"}
funcool/rumext {:mvn/version "2020.11.27-0"} funcool/rumext {:mvn/version "2020.11.27-0"}

12
frontend/src/app/main/ui.cljs
View file

@ -266,19 +266,21 @@
(defmethod ptk/handle-error :default (defmethod ptk/handle-error :default
[error] [error]
(js/console.log error)
(if (instance? ExceptionInfo error) (if (instance? ExceptionInfo error)
(ptk/handle-error (ex-data error)) (ptk/handle-error (ex-data error))
(do (do
(js/console.group "Generic Error:") (js/console.group "Generic Error")
(js/console.log "hint:" (or (ex-message error)
(:hint error)
(:message error)))
(ex/ignoring (ex/ignoring
(js/console.error (pr-str error)) (js/console.error "repr: " (pr-str error))
(js/console.error (.-stack error))) (js/console.error "stack:" (.-stack error)))
(js/console.groupEnd "Generic error") (js/console.groupEnd "Generic error")
(ts/schedule (st/emitf (dm/show (ts/schedule (st/emitf (dm/show
{:content "Something wrong has happened." {:content "Something wrong has happened."
:type :error :type :error
:timeout 5000})))))) :timeout 3000}))))))
(defmethod ptk/handle-error :server-error (defmethod ptk/handle-error :server-error
[{:keys [status] :as error}] [{:keys [status] :as error}]

4
frontend/src/app/main/ui/workspace/context_menu.cljs
View file

@ -55,8 +55,8 @@
do-duplicate #(st/emit! dw/duplicate-selected) do-duplicate #(st/emit! dw/duplicate-selected)
do-delete #(st/emit! dw/delete-selected) do-delete #(st/emit! dw/delete-selected)
do-copy #(st/emit! dw/copy-selected) do-copy #(st/emit! (dw/copy-selected))
do-cut #(st/emit! dw/copy-selected dw/delete-selected) do-cut #(st/emit! (dw/copy-selected) dw/delete-selected)
do-paste #(st/emit! dw/paste) do-paste #(st/emit! dw/paste)
do-bring-forward #(st/emit! (dw/vertical-order-selected :up)) do-bring-forward #(st/emit! (dw/vertical-order-selected :up))
do-bring-to-front #(st/emit! (dw/vertical-order-selected :top)) do-bring-to-front #(st/emit! (dw/vertical-order-selected :top))