Merge pull request #3774 from tgxworld/meta_keys_header

Fixes for headers.
This commit is contained in:
Robin Ward 2015-09-16 14:33:08 -04:00
commit 91db481fae
3 changed files with 15 additions and 12 deletions

View File

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

View File

@ -1,4 +1,5 @@
{{#each results as |result|}}
<li>
<a class='search-link' href='{{unbound result.urlWithNumber}}'>
<span class='topic'>
{{i18n 'search.post_format' post_number=result.post_number username=result.username}}
@ -9,4 +10,5 @@
</span>
{{/unless}}
</a>
</li>
{{/each}}

View File

@ -8,7 +8,7 @@
{{view 'reply-history' content=replyHistory}}
</div>
<article class="boxed {{if via_email 'via-email'}}" id={{postElementId}} data-post-id={{id}} data-user-id={{user_id}}>
<article class="boxed {{if via_email 'via-email'}}" id={{view.postElementId}} data-post-id={{id}} data-user-id={{user_id}}>
<div class='row'>
<div class='topic-avatar'>