summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2018-05-14 16:59:07 +0100
committerPhil Hughes <me@iamphill.com>2018-05-14 16:59:07 +0100
commitca6e2a4566dd1210c8d9cf51aeba97cf15b937e8 (patch)
tree4ddae73243800c8e6bdbcb843452573136bff3d6
parent6a77a6a11f28fe94ac17f389ff1e5ea0ea53ac20 (diff)
downloadgitlab-ce-ca6e2a4566dd1210c8d9cf51aeba97cf15b937e8.tar.gz
Fixed IDE file finder ordering
Fixes the file finder not opening when focused inside the editor
-rw-r--r--app/assets/javascripts/ide/components/file_finder/index.vue10
-rw-r--r--app/assets/javascripts/ide/components/ide.vue4
2 files changed, 7 insertions, 7 deletions
diff --git a/app/assets/javascripts/ide/components/file_finder/index.vue b/app/assets/javascripts/ide/components/file_finder/index.vue
index ea2b13a8b21..cabb3f59b17 100644
--- a/app/assets/javascripts/ide/components/file_finder/index.vue
+++ b/app/assets/javascripts/ide/components/file_finder/index.vue
@@ -39,12 +39,10 @@ export default {
return this.allBlobs.slice(0, MAX_FILE_FINDER_RESULTS);
}
- return fuzzaldrinPlus
- .filter(this.allBlobs, searchText, {
- key: 'path',
- maxResults: MAX_FILE_FINDER_RESULTS,
- })
- .sort((a, b) => b.lastOpenedAt - a.lastOpenedAt);
+ return fuzzaldrinPlus.filter(this.allBlobs, searchText, {
+ key: 'path',
+ maxResults: MAX_FILE_FINDER_RESULTS,
+ });
},
filteredBlobsLength() {
return this.filteredBlobs.length;
diff --git a/app/assets/javascripts/ide/components/ide.vue b/app/assets/javascripts/ide/components/ide.vue
index 6c373a92776..816721958d6 100644
--- a/app/assets/javascripts/ide/components/ide.vue
+++ b/app/assets/javascripts/ide/components/ide.vue
@@ -44,7 +44,9 @@ export default {
e.preventDefault();
}
- this.toggleFileFinder(!this.fileFindVisible);
+ if (!e.target.classList.contains('inputarea')) {
+ this.toggleFileFinder(!this.fileFindVisible);
+ }
});
Mousetrap.stopCallback = (e, el, combo) => this.mousetrapStopCallback(e, el, combo);