IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-20 11:48:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

DEV: Modernise navigation-bar plugin-outlet (#15478)

Browse Source 
This workaround was introduced before we had the ability to render components with no wrapper element. Now we can pass `tagName=""` to `plugin-outlet`.
This commit is contained in:
David Taylor 2022-01-06 19:15:29 +00:00 committed by GitHub
parent cd1d0322f7
commit 2bcb5360b6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/discourse/app/components/navigation-bar.js
View File

@ -3,7 +3,6 @@ import Component from "@ember/component";
import DiscourseURL from "discourse/lib/url"; import DiscourseURL from "discourse/lib/url";
import FilterModeMixin from "discourse/mixins/filter-mode"; import FilterModeMixin from "discourse/mixins/filter-mode";
import { next } from "@ember/runloop"; import { next } from "@ember/runloop";
import { renderedConnectorsFor } from "discourse/lib/plugin-connectors";
export default Component.extend(FilterModeMixin, { export default Component.extend(FilterModeMixin, {
tagName: "ul", tagName: "ul",
@ -12,7 +11,6 @@ export default Component.extend(FilterModeMixin, {
init() { init() {
this._super(...arguments); this._super(...arguments);
this.set("connectors", renderedConnectorsFor("extra-nav-item", null, this));
}, },
@discourseComputed("filterType", "navItems") @discourseComputed("filterType", "navItems")

5
app/assets/javascripts/discourse/app/templates/components/navigation-bar.hbs
View File

@ -2,7 +2,4 @@
{{navigation-item content=navItem filterMode=filterMode category=category}} {{navigation-item content=navItem filterMode=filterMode category=category}}
{{/each}} {{/each}}
{{custom-html name="extraNavItem" tagName="li"}} {{custom-html name="extraNavItem" tagName="li"}}
{{!- this is done to avoid DIV in the UL, originally {{plugin-outlet name="extra-nav-item"}} {{plugin-outlet name="extra-nav-item" tagName="" connectorTagName="li" args=(hash category=category filterMode=filterMode)}}
{{#each connectors as |c|}}
{{plugin-connector connector=c class=c.classNames tagName="li" args=(hash category=category filterMode=filterMode)}}
{{/each}}

4
app/assets/javascripts/discourse/app/templates/mobile/components/navigation-bar.hbs
View File

@ -9,8 +9,6 @@
{{#each navItems as |navItem|}} {{#each navItems as |navItem|}}
{{navigation-item content=navItem filterMode=filterMode category=category}} {{navigation-item content=navItem filterMode=filterMode category=category}}
{{/each}} {{/each}}
{{#each connectors as |c|}} {{plugin-outlet name="extra-nav-item" tagName="" connectorTagName="li" args=(hash category=category filterMode=filterMode)}}
{{plugin-connector connector=c class=c.classNames tagName="li" args=(hash category=category filterMode=filterMode)}}
{{/each}}
</ul> </ul>
{{/if}} {{/if}}