summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/shortcuts.js
diff options
context:
space:
mode:
authorFilipa Lacerda <filipa@gitlab.com>2018-01-18 16:58:46 +0000
committerFilipa Lacerda <filipa@gitlab.com>2018-01-18 16:58:46 +0000
commit1a3f3777586cdee0578f210b654196027fa6ed8b (patch)
treeba3ee23b76680b707d8369ce7efb1412408b8e4d /app/assets/javascripts/shortcuts.js
parent64379e3206ea6745816025a39aeaf045352a37d5 (diff)
parentc3f26b0aaff62db797dda69a43e9dc2a52f70e2f (diff)
downloadgitlab-ce-1a3f3777586cdee0578f210b654196027fa6ed8b.tar.gz
Merge branch 'dispatcher-projects' into 'master'
Added dispatcher imports for some project routes See merge request gitlab-org/gitlab-ce!16389
Diffstat (limited to 'app/assets/javascripts/shortcuts.js')
-rw-r--r--app/assets/javascripts/shortcuts.js6
1 files changed, 2 insertions, 4 deletions
diff --git a/app/assets/javascripts/shortcuts.js b/app/assets/javascripts/shortcuts.js
index 5351873e945..cd5ab53eace 100644
--- a/app/assets/javascripts/shortcuts.js
+++ b/app/assets/javascripts/shortcuts.js
@@ -13,12 +13,10 @@ Mousetrap.stopCallback = (e, element, combo) => {
};
export default class Shortcuts {
- constructor(skipResetBindings) {
+ constructor() {
this.onToggleHelp = this.onToggleHelp.bind(this);
this.enabledHelp = [];
- if (!skipResetBindings) {
- Mousetrap.reset();
- }
+
Mousetrap.bind('?', this.onToggleHelp);
Mousetrap.bind('s', Shortcuts.focusSearch);
Mousetrap.bind('f', this.focusFilter.bind(this));