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 #3600 from tgxworld/fix_search_show_more_dismissing 

FIX: Clicking 'show more' should not dismiss search dropdown.
This commit is contained in:
Sam 2015-07-13 10:03:50 +10:00
parent 0f9d2d2d96 7a8c26babc
commit d247c002bc
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/discourse/templates/search.hbs
View File

@ -28,7 +28,7 @@
<a href="{{resultType.moreUrl}}" class="filter">{{i18n "show_more"}} {{fa-icon "chevron-down"}}</a> <a href="{{resultType.moreUrl}}" class="filter">{{i18n "show_more"}} {{fa-icon "chevron-down"}}</a>
{{/if}} {{/if}}
{{#if resultType.more}} {{#if resultType.more}}
<a href class="filter" {{action "moreOfType" resultType.type bubbles=false}}>{{i18n "show_more"}} {{fa-icon "chevron-down"}}</a> <a href class="filter filter-type" {{action "moreOfType" resultType.type bubbles=false}}>{{i18n "show_more"}} {{fa-icon "chevron-down"}}</a>
{{/if}} {{/if}}
</div> </div>
{{/each}} {{/each}}

2
app/assets/javascripts/discourse/views/header.js.es6
View File

@ -80,7 +80,7 @@ export default Discourse.View.extend({
}); });
$dropdown.on('click.d-dropdown', function(e) { $dropdown.on('click.d-dropdown', function(e) {
return $(e.target).closest('a').not('.search-link').length > 0 ? hideDropdown.apply(self) : true; return $(e.target).closest('a').not('.search-link, .filter-type').length > 0 ? hideDropdown.apply(self) : true;
}); });
$html.data('hide-dropdown', hideDropdown); $html.data('hide-dropdown', hideDropdown);