Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3844 from gschlager/patch-1 

FIX: Pressing Ctrl+F twice should show browser find
This commit is contained in:
Neil Lalonde 2015-10-16 13:16:55 -04:00
parent 8f2b002203 d10741170f
commit 14bfeec25e
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/assets/javascripts/discourse/lib/keyboard-shortcuts.js.es6
View File

@ -3,7 +3,7 @@ import DiscourseURL from 'discourse/lib/url';
const bindings = {
'!': {postAction: 'showFlags'},
'#': {handler: 'toggleProgress', anonymous: true},
'/': {handler: 'showSearch', anonymous: true},
'/': {handler: 'toggleSearch', anonymous: true},
'=': {handler: 'toggleHamburgerMenu', anonymous: true},
'?': {handler: 'showHelpModal', anonymous: true},
'.': {click: '.alert.alert-info.clickable', anonymous: true}, // show incoming/updated topics
@ -142,6 +142,11 @@ export default {
},
showBuiltinSearch() {
if (this.container.lookup('controller:header').get('searchVisible')) {
this.toggleSearch();
return true;
}
this.searchService.set('searchContextEnabled', false);
const currentPath = this.container.lookup('controller:application').get('currentPath'),
@ -157,7 +162,7 @@ export default {
if (showSearch) {
this.searchService.set('searchContextEnabled', true);
this.showSearch();
this.toggleSearch();
return false;
}
@ -176,7 +181,7 @@ export default {
this.container.lookup('controller:topic-progress').send('toggleExpansion', {highlight: true});
},
showSearch() {
toggleSearch() {
this.container.lookup('controller:header').send('toggleSearch');
return false;
},