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

DEV: Add top level `<div>` when using Ember CLI (#12878) 

Eventually we'd like to remove this but it makes our Ember CLI build
consistent with the non-ember version.
This commit is contained in:
Robin Ward 2021-04-29 14:13:19 -04:00 committed by GitHub
parent 7423943ffe
commit bd23e793b7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 48 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/assets/javascripts/discourse/app/components/discourse-root.js Normal file
View File

@ -0,0 +1,10 @@
import Component from "@ember/component";
let componentArgs = { tagName: "div" };
// TODO: Once we've moved to Ember CLI completely we can remove this.
if (!Ember.FEATURES.EMBER_GLIMMER_SET_COMPONENT_TEMPLATE) {
componentArgs = { tagName: "" };
}
export default Component.extend(componentArgs);

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

@ -1,42 +1,44 @@
{{d-document}}
{{plugin-outlet name="above-site-header" tagName=""}}
{{site-header canSignUp=canSignUp
showCreateAccount=(route-action "showCreateAccount")
showLogin=(route-action "showLogin")
showKeyboard=(route-action "showKeyboardShortcutsHelp")
toggleMobileView=(route-action "toggleMobileView")
toggleAnonymous=(route-action "toggleAnonymous")
logout=(route-action "logout")}}
{{software-update-prompt id="software-update-prompt"}}
{{#discourse-root}}
{{d-document}}
{{plugin-outlet name="above-site-header" tagName=""}}
{{site-header canSignUp=canSignUp
showCreateAccount=(route-action "showCreateAccount")
showLogin=(route-action "showLogin")
showKeyboard=(route-action "showKeyboardShortcutsHelp")
toggleMobileView=(route-action "toggleMobileView")
toggleAnonymous=(route-action "toggleAnonymous")
logout=(route-action "logout")}}
{{software-update-prompt id="software-update-prompt"}}
{{plugin-outlet name="below-site-header" tagName="" args=(hash currentPath=router._router.currentPath)}}
{{plugin-outlet name="below-site-header" tagName="" args=(hash currentPath=router._router.currentPath)}}
<div id="main-outlet" class="wrap" role="main">
{{plugin-outlet name="above-main-container" tagName=""}}
<div class="container">
{{#if showTop}}
{{custom-html name="top"}}
{{/if}}
{{notification-consent-banner}}
{{pwa-install-banner}}
{{global-notice}}
{{create-topics-notice}}
{{plugin-outlet name="top-notices" tagName="" args=(hash currentPath=router._router.currentPath)}}
<div id="main-outlet" class="wrap" role="main">
{{plugin-outlet name="above-main-container" tagName=""}}
<div class="container">
{{#if showTop}}
{{custom-html name="top"}}
{{/if}}
{{notification-consent-banner}}
{{pwa-install-banner}}
{{global-notice}}
{{create-topics-notice}}
{{plugin-outlet name="top-notices" tagName="" args=(hash currentPath=router._router.currentPath)}}
</div>
{{outlet}}
{{outlet "user-card"}}
</div>
{{outlet}}
{{outlet "user-card"}}
</div>
{{plugin-outlet name="above-footer" tagName="" args=(hash showFooter=showFooter)}}
{{#if showFooter}}
{{custom-html name="footer" triggerAppEvent="true"}}
{{/if}}
{{plugin-outlet name="below-footer" tagName="" args=(hash showFooter=showFooter)}}
{{plugin-outlet name="above-footer" tagName="" args=(hash showFooter=showFooter)}}
{{#if showFooter}}
{{custom-html name="footer" triggerAppEvent="true"}}
{{/if}}
{{plugin-outlet name="below-footer" tagName="" args=(hash showFooter=showFooter)}}
{{outlet "modal"}}
{{topic-entrance}}
{{outlet "composer"}}
{{outlet "modal"}}
{{topic-entrance}}
{{outlet "composer"}}
{{#if showFooterNav}}
{{footer-nav}}
{{/if}}
{{#if showFooterNav}}
{{footer-nav}}
{{/if}}
{{/discourse-root}}