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

FIX: select context when search triggered via CTRL-F

This commit is contained in:
Sam 2014-07-08 12:40:51 +10:00
parent fcbc7729b6
commit 8e31fe4835
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/assets/javascripts/discourse/lib/keyboard_shortcuts.js
View File

@ -127,7 +127,7 @@ Discourse.KeyboardShortcuts = Ember.Object.createWithMixins({
var blacklisted = _.any(blacklist, check);
if(whitelisted && !blacklisted){
return this.showSearch();
return this.showSearch(true);
} else {
return true;
}
@ -137,8 +137,11 @@ Discourse.KeyboardShortcuts = Ember.Object.createWithMixins({
Discourse.__container__.lookup('controller:topic-progress').send('toggleExpansion');
},
showSearch: function() {
showSearch: function(selectContext) {
$('#search-button').click();
if(selectContext) {
Discourse.__container__.lookup('controller:search').set('searchContextEnabled', true);
}
return false;
},