From a3bd86f85c06f8160f33489fd62c89349ac0a346 Mon Sep 17 00:00:00 2001 From: Bianca Nenciu Date: Thu, 21 Dec 2023 11:54:47 +0200 Subject: [PATCH] DEV: Clean up category-link (#24988) The `style` variable is always set because every category has a color defined, so the surrounding if statement is unnecessary. "+ X categories" option has also been removed in the past and the code related to it is now dead code. --- .../discourse/app/helpers/category-link.js | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/app/assets/javascripts/discourse/app/helpers/category-link.js b/app/assets/javascripts/discourse/app/helpers/category-link.js index 35b0418d1ec..b6b0979120c 100644 --- a/app/assets/javascripts/discourse/app/helpers/category-link.js +++ b/app/assets/javascripts/discourse/app/helpers/category-link.js @@ -111,6 +111,7 @@ export function defaultCategoryLinkRenderer(category, opts) { let href = opts.link === false ? "" : url; let tagName = opts.link === false || opts.link === "false" ? "span" : "a"; let extraClasses = opts.extraClasses ? " " + opts.extraClasses : ""; + let style = `${categoryVariables(category)}`; let html = ""; let parentCat = null; let categoryDir = ""; @@ -172,18 +173,7 @@ export function defaultCategoryLinkRenderer(category, opts) { href = ` href="${href}" `; } - let afterBadgeWrapper = ""; - - if (opts.plusSubcategories && opts.lastSubcategory) { - afterBadgeWrapper += ` - ${I18n.t("category_row.plus_subcategories", { - count: opts.plusSubcategories, - })} - `; - } - - const style = categoryVariables(category); - const extraAttrs = style.string ? `style="${style}"` : ""; - - return `<${tagName} class="badge-category__wrapper ${extraClasses}" ${extraAttrs} ${href}>${html}${afterBadgeWrapper}`; + return `<${tagName} class="badge-category__wrapper ${extraClasses}" ${ + style.length > 0 ? `style="${style}"` : "" + } ${href}>${html}`; }