codeninjasllc/discourse
1
0
Fork 0
mirror of https://github.com/codeninjasllc/discourse.git synced 2025-02-25 16:04:22 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

FIX: Support subfolder URLs for middle clicking search

Browse source
This commit is contained in:
Robin Ward 2015-10-23 12:01:25 -04:00
parent 9483940244
commit f3d9d1295a
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/assets/javascripts/discourse/components/header-dropdown.js.es6
View file

@ -4,9 +4,9 @@ export default Ember.Component.extend({
tagName: 'li', tagName: 'li',
classNameBindings: [':header-dropdown-toggle', 'active'], classNameBindings: [':header-dropdown-toggle', 'active'],
@computed('showUser') @computed('showUser', 'path')
href(showUser) { href(showUser, path) {
return showUser ? this.currentUser.get('path') : ''; return showUser ? this.currentUser.get('path') : Discourse.getURL(path);
}, },
active: Ember.computed.alias('toggleVisible'), active: Ember.computed.alias('toggleVisible'),

2
app/assets/javascripts/discourse/templates/header.hbs
View file

@ -22,7 +22,7 @@
mobileAction="fullPageSearch" mobileAction="fullPageSearch"
loginAction="showLogin" loginAction="showLogin"
title="search.title" title="search.title"
href="/search"}} path="/search"}}
{{/header-dropdown}} {{/header-dropdown}}
{{#header-dropdown iconId="toggle-hamburger-menu" {{#header-dropdown iconId="toggle-hamburger-menu"