diff options
| -rw-r--r-- | core/search/js/search.js | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/core/search/js/search.js b/core/search/js/search.js index 92cf034cf7d..ef99cf7e961 100644 --- a/core/search/js/search.js +++ b/core/search/js/search.js @@ -344,7 +344,12 @@ }); $(document).keydown(function(event) { - if ((event.ctrlKey || event.metaKey) && !event.shiftKey && event.keyCode === 70) { // Ctrl+F + if ((event.ctrlKey || event.metaKey) && // Ctrl or Command (OSX) + !event.shiftKey && + event.keyCode === 70 && // F + self.hasFilter(getCurrentApp()) && // Search is enabled + !$searchBox.is(':focus') // if searchbox is already focused do nothing (fallback to browser default) + ) { $searchBox.focus(); event.preventDefault(); } |