Browse Source

Merge branch 'GhassenRjab-devel' into devel

Fix "W" shortcut binding. Thanks to GhassenRjab ! Closes #1064
Lauri Ojansivu 8 years ago
parent
commit
b08dccf7d4
2 changed files with 7 additions and 2 deletions
  1. 2 1
      CHANGELOG.md
  2. 5 1
      client/lib/keyboard.js

+ 2 - 1
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.

+ 5 - 1
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', () => {