diff options
author | Filipa Lacerda <filipa@gitlab.com> | 2018-05-23 11:50:32 +0300 |
---|---|---|
committer | Filipa Lacerda <filipa@gitlab.com> | 2018-05-23 12:22:23 +0300 |
commit | 8c22568d4035712fdba913a96e61f57b65b8aa17 (patch) | |
tree | 8d8de7d1016bbdf46c479fd3265809b680fb9fcd /app | |
parent | d9734c258ca6f3f9588f1d85baa2e476cc443d6f (diff) |
Merge branch 'ide-file-finder-improve-order' into 'master'
Fixed IDE file finder ordering
See merge request gitlab-org/gitlab-ce!18948
Diffstat (limited to 'app')
-rw-r--r-- | app/assets/javascripts/ide/components/file_finder/index.vue | 10 | ||||
-rw-r--r-- | app/assets/javascripts/ide/components/ide.vue | 5 |
2 files changed, 8 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..1ec69adce09 100644 --- a/app/assets/javascripts/ide/components/ide.vue +++ b/app/assets/javascripts/ide/components/ide.vue @@ -52,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; |