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

UX: Only intercept Cmd-F/Ctrl-F for search on a topic when not all posts 

are available in the DOM.
This commit is contained in:
Robin Ward 2014-09-09 16:05:17 -04:00
parent 504d61de94
commit a09ff29dd9
1 changed files with 10 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -116,25 +116,19 @@ Discourse.KeyboardShortcuts = Ember.Object.createWithMixins({
}, },
showBuiltinSearch: function() { showBuiltinSearch: function() {
var routeName = _.map(Discourse.Router.router.currentHandlerInfos, "name").join("_"); var currentPath = this.container.lookup('controller:application').get('currentPath'),
var blacklist = [ blacklist = [ /^discovery\.categories/ ],
/^application_discovery_discovery.categories/ whitelist = [ /^topic\./ ],
]; check = function(regex) { return !!currentPath.match(regex); },
showSearch = whitelist.any(check) && !blacklist.any(check);
var whitelist = [ // If we're viewing a topic, only intercept search if there are cloaked posts
/^application_topic_/ if (showSearch && currentPath.match(/^topic\./)) {
]; showSearch = $('.cooked').length < this.container.lookup('controller:topic').get('postStream.stream.length');
var check = function(regex){return routeName.match(regex);};
var whitelisted = _.any(whitelist, check);
var blacklisted = _.any(blacklist, check);
if(whitelisted && !blacklisted){
return this.showSearch(true);
} else {
return true;
} }
return showSearch ? this.showSearch(true) : true;
}, },
toggleProgress: function() { toggleProgress: function() {