codeninjasllc/discourse
1
0
Fork 0
mirror of https://github.com/codeninjasllc/discourse.git synced 2024-11-28 10:08:20 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

FIX: Don't dismiss dropdown when searching within posts context.

Browse source
This commit is contained in:
Guo Xiang Tan 2015-09-17 01:21:00 +08:00
parent 685471303a
commit 2958b4b0a1
3 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/assets/javascripts/discourse/components/menu-panel.js.es6
View file

@ -156,7 +156,8 @@ export default Ember.Component.extend({
_bindEvents() { _bindEvents() {
this.$().on('click.discourse-menu-panel', 'a', e => { this.$().on('click.discourse-menu-panel', 'a', e => {
if (e.metaKey || e.ctrlKey || e.shiftKey) { return; } if (e.metaKey || e.ctrlKey || e.shiftKey) { return; }
if ($(e.target).data('ember-action')) { return; } const $target = $(e.target);
if ($target.data('ember-action') || $target.closest('.search-link').length > 0) { return; }
this.hide(); this.hide();
}); });

3
app/assets/javascripts/discourse/lib/click-event.js.es6
View file

@ -1,3 +0,0 @@
export function isModifierOrMetaKey(event) {
return e.metaKey || e.ctrlKey || e.shiftKey;
}

20
app/assets/javascripts/discourse/templates/components/search-result-post.hbs
View file

@ -1,12 +1,14 @@
{{#each results as |result|}} {{#each results as |result|}}
<a class='search-link' href='{{unbound result.urlWithNumber}}'> <li>
<span class='topic'> <a class='search-link' href='{{unbound result.urlWithNumber}}'>
{{i18n 'search.post_format' post_number=result.post_number username=result.username}} <span class='topic'>
</span> {{i18n 'search.post_format' post_number=result.post_number username=result.username}}
{{#unless site.mobileView}}
<span class='blurb'>
{{{unbound result.blurb}}}
</span> </span>
{{/unless}} {{#unless site.mobileView}}
</a> <span class='blurb'>
{{{unbound result.blurb}}}
</span>
{{/unless}}
</a>
</li>
{{/each}} {{/each}}