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

DEV: Explicitly allow NavItem customization (#17061) 

Allow overriding NavItem's title and displayName. Fixes multiple instances of `computed-property.override` warnings in plugins.
This commit is contained in:
Jarek Radosz 2022-06-13 12:46:04 +02:00 committed by GitHub
parent 8d0c2cd4f8
commit 77632d2d36
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 35 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
app/assets/javascripts/discourse/app/models/nav-item.js
View File

@ -17,12 +17,27 @@ import { reads } from "@ember/object/computed";
const NavItem = EmberObject.extend({ const NavItem = EmberObject.extend({
@discourseComputed("name") @discourseComputed("name")
title(name) { title: {
get(name) {
if (this._title) {
return this._title;
}
return I18n.t("filters." + name.replace("/", ".") + ".help", {}); return I18n.t("filters." + name.replace("/", ".") + ".help", {});
}, },
set(value) {
this.set("_title", value);
},
},
@discourseComputed("name", "count") @discourseComputed("name", "count")
displayName(name, count) { displayName: {
get(name, count) {
if (this._displayName) {
return this._displayName;
}
count = count || 0; count = count || 0;
if ( if (
@ -40,6 +55,11 @@ const NavItem = EmberObject.extend({
); );
}, },
set(value) {
this.set("_displayName", value);
},
},
@discourseComputed("filterType", "category", "noSubcategories", "tagId") @discourseComputed("filterType", "category", "noSubcategories", "tagId")
href(filterType, category, noSubcategories, tagId) { href(filterType, category, noSubcategories, tagId) {
let customHref = null; let customHref = null;