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

DEV: Move menu-item-end PluginOutlet outside <a> tag (#25001)

This commit is contained in:
Mark VanLandingham 2023-12-21 12:39:17 -06:00 committed by GitHub
parent 2887e2c055
commit 7c7e2aeff8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/assets/javascripts/discourse/app/components/user-menu/menu-item.hbs
View File

@ -25,10 +25,9 @@
{{/if}} {{/if}}
</div> </div>
<PluginOutlet @name="menu-item-end" @outletArgs={{hash item=this}}> {{#if this.endComponent}}
{{#if this.endComponent}} <this.endComponent />
<this.endComponent /> {{/if}}
{{/if}}
</PluginOutlet>
</a> </a>
<PluginOutlet @name="menu-item-end" @outletArgs={{this.endOutletArgs}} />
</li> </li>

4
app/assets/javascripts/discourse/app/components/user-menu/menu-item.js
View File

@ -61,6 +61,10 @@ export default class UserMenuItem extends Component {
return this.#item.endComponent; return this.#item.endComponent;
} }
get endOutletArgs() {
return this.#item.endOutletArgs;
}
get #item() { get #item() {
return this.args.item; return this.args.item;
} }

6
app/assets/javascripts/discourse/app/lib/user-menu/notification-item.js
View File

@ -70,6 +70,12 @@ export default class UserMenuNotificationItem extends UserMenuBaseItem {
return this.notification.acting_user_avatar_template; return this.notification.acting_user_avatar_template;
} }
get endOutletArgs() {
return {
notification: this.notification,
};
}
get #notificationName() { get #notificationName() {
return this.site.notificationLookup[this.notification.notification_type]; return this.site.notificationLookup[this.notification.notification_type];
} }