From d64542689ea520a932e12de5c9b69ea0815d975d Mon Sep 17 00:00:00 2001 From: Pierluigi Cau Date: Fri, 22 Jan 2016 12:01:13 +0100 Subject: [PATCH 1/2] Using keypress lowers Mousetrap sensitivity --- src/js/components/Marathon.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/js/components/Marathon.jsx b/src/js/components/Marathon.jsx index fdd500885..e77279429 100644 --- a/src/js/components/Marathon.jsx +++ b/src/js/components/Marathon.jsx @@ -120,7 +120,7 @@ var Marathon = React.createClass({ Mousetrap.bind("c", function () { router.transitionTo(router.getCurrentPathname(), {}, {modal: "new-app"}); - }, "keyup"); + }, "keypress"); Mousetrap.bind("g a", function () { if (this.state.modal == null) { From 6b9b37165b2b04b7465c3082470484161479e340 Mon Sep 17 00:00:00 2001 From: Pierluigi Cau Date: Fri, 22 Jan 2016 12:03:46 +0100 Subject: [PATCH 2/2] Add CHANGELOG entry --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index a9e358e55..d82128891 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +## Unversioned +### Fixed +- \#3605 - Prevent ctrl-c keyboard shortcut from showing the Create modal dialog + ## 0.15.0 - 2016-01-20 ### Added - \#2814 - Add contextual dropdown menu to Application List items