Skip to content

Commit

Permalink
Merge pull request #579 from mesosphere/fix/3065-mousetrap
Browse files Browse the repository at this point in the history
Using keypress instead of keyup to lower Mousetrap sensitivity
  • Loading branch information
aldipower committed Jan 22, 2016
2 parents dba4406 + 6b9b371 commit ed91a98
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 1 deletion.
4 changes: 4 additions & 0 deletions 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
Expand Down
2 changes: 1 addition & 1 deletion src/js/components/Marathon.jsx
Expand Up @@ -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) {
Expand Down

0 comments on commit ed91a98

Please sign in to comment.