diff options
| author | Lauri Ojansivu <x@xet7.org> | 2017-06-17 17:49:49 +0300 |
|---|---|---|
| committer | Lauri Ojansivu <x@xet7.org> | 2017-06-17 17:49:49 +0300 |
| commit | b08dccf7d4f972ce2bb0e6343476381a8f8a31e8 (patch) | |
| tree | 9a3a2cd655ed5c87ca0e90406c0e73cae797cff6 | |
| parent | 83d14b910cefe8134a056984e16315db86860b41 (diff) | |
| parent | 9b64215b64fff22edab15b227cd8fc16ac858bd8 (diff) | |
| download | wekan-b08dccf7d4f972ce2bb0e6343476381a8f8a31e8.tar.gz wekan-b08dccf7d4f972ce2bb0e6343476381a8f8a31e8.tar.bz2 wekan-b08dccf7d4f972ce2bb0e6343476381a8f8a31e8.zip | |
Merge branch 'GhassenRjab-devel' into devel
Fix "W" shortcut binding. Thanks to GhassenRjab ! Closes #1064
| -rw-r--r-- | CHANGELOG.md | 3 | ||||
| -rwxr-xr-x | client/lib/keyboard.js | 6 |
2 files changed, 7 insertions, 2 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 8062cbdd..2c30db3f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,7 +10,8 @@ This release adds the following new features: and fixes the following bugs: * [Fix IE 11 drag board to scroll](https://github.com/wekan/wekan/pull/1052); -* [Fix Export Wekan board](https://github.com/wekan/wekan/pull/1067). +* [Fix Export Wekan board](https://github.com/wekan/wekan/pull/1067); +* [Fix "W" shortcut binding](https://github.com/wekan/wekan/pull/1066). Thanks to GitHub users BaobabCoder, GhassenRjab, nebulade and nztqa for their contributions. diff --git a/client/lib/keyboard.js b/client/lib/keyboard.js index ff18738b..24955929 100755 --- a/client/lib/keyboard.js +++ b/client/lib/keyboard.js @@ -6,7 +6,11 @@ Mousetrap.bind('?', () => { }); Mousetrap.bind('w', () => { - Sidebar.toggle(); + if (Sidebar.isOpen() && Sidebar.getView() === 'home') { + Sidebar.toggle(); + } else { + Sidebar.setView(); + } }); Mousetrap.bind('q', () => { |