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

DEV: ensures application.hbs is using router currentPath (#7929)

This commit is contained in:
Joffrey JAFFEUX 2019-07-24 13:33:59 +02:00 committed by GitHub
parent e444ce7ccd
commit e83dcfdb7b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/assets/javascripts/discourse/controllers/application.js.es6
View File

@ -4,6 +4,7 @@ import { isAppWebview, isiOSPWA } from "discourse/lib/utilities";
export default Ember.Controller.extend({ export default Ember.Controller.extend({
showTop: true, showTop: true,
showFooter: false, showFooter: false,
router: Ember.inject.service(),
@computed @computed
canSignUp() { canSignUp() {

4
app/assets/javascripts/discourse/templates/application.hbs
View File

@ -7,7 +7,7 @@
toggleAnonymous=(route-action "toggleAnonymous") toggleAnonymous=(route-action "toggleAnonymous")
logout=(route-action "logout")}} logout=(route-action "logout")}}
{{plugin-outlet name="below-site-header" args=(hash currentPath=currentPath)}} {{plugin-outlet name="below-site-header" args=(hash currentPath=router._router.currentPath)}}
<div id="main-outlet" class="wrap"> <div id="main-outlet" class="wrap">
{{plugin-outlet name="above-main-container"}} {{plugin-outlet name="above-main-container"}}
@ -18,7 +18,7 @@
{{notification-consent-banner}} {{notification-consent-banner}}
{{global-notice}} {{global-notice}}
{{create-topics-notice}} {{create-topics-notice}}
{{plugin-outlet name="top-notices" args=(hash currentPath=currentPath)}} {{plugin-outlet name="top-notices" args=(hash currentPath=router._router.currentPath)}}
</div> </div>
{{outlet}} {{outlet}}
{{outlet "user-card"}} {{outlet "user-card"}}