Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2018-05-22 17:16:10 +0300
committerPhil Hughes <me@iamphill.com>2018-05-22 17:16:10 +0300
commita7ea0e6bfb1fa11c8607281815a7bb6d70f89c25 (patch)
tree94d2dc2061ca3315b41dbdee28bdff39145c9e06 /app/assets/javascripts/ide/components/ide.vue
parentca6e2a4566dd1210c8d9cf51aeba97cf15b937e8 (diff)
changed what bit of code stops the callback
Diffstat (limited to 'app/assets/javascripts/ide/components/ide.vue')
-rw-r--r--app/assets/javascripts/ide/components/ide.vue9
1 files changed, 5 insertions, 4 deletions
diff --git a/app/assets/javascripts/ide/components/ide.vue b/app/assets/javascripts/ide/components/ide.vue
index 816721958d6..1ec69adce09 100644
--- a/app/assets/javascripts/ide/components/ide.vue
+++ b/app/assets/javascripts/ide/components/ide.vue
@@ -44,9 +44,7 @@ export default {
e.preventDefault();
}
- if (!e.target.classList.contains('inputarea')) {
- this.toggleFileFinder(!this.fileFindVisible);
- }
+ this.toggleFileFinder(!this.fileFindVisible);
});
Mousetrap.stopCallback = (e, el, combo) => this.mousetrapStopCallback(e, el, combo);
@@ -54,7 +52,10 @@ export default {
methods: {
...mapActions(['toggleFileFinder']),
mousetrapStopCallback(e, el, combo) {
- if (combo === 't' && el.classList.contains('dropdown-input-field')) {
+ if (
+ (combo === 't' && el.classList.contains('dropdown-input-field')) ||
+ el.classList.contains('inputarea')
+ ) {
return true;
} else if (combo === 'command+p' || combo === 'ctrl+p') {
return false;