github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-24 03:36:18 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

DEV: Add new style filterType property to NavItem model

Browse Source
This commit is contained in:
Daniel Waterworth
2019-11-21 10:59:30 +00:00
parent 556b29952c
commit 585a229d3f
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2,6 +2,7 @@ import discourseComputed from "discourse-common/utils/decorators";
import { emojiUnescape } from "discourse/lib/text"; import { emojiUnescape } from "discourse/lib/text";
import Category from "discourse/models/category"; import Category from "discourse/models/category";
import EmberObject from "@ember/object"; import EmberObject from "@ember/object";
import { reads } from "@ember/object/computed";
import deprecated from "discourse-common/lib/deprecated"; import deprecated from "discourse-common/lib/deprecated";
import Site from "discourse/models/site"; import Site from "discourse/models/site";
import User from "discourse/models/user"; import User from "discourse/models/user";
@ -33,8 +34,8 @@ const NavItem = EmberObject.extend({
); );
}, },
@discourseComputed("name", "category", "noSubcategories", "tagId") @discourseComputed("filterType", "category", "noSubcategories", "tagId")
href(filterMode, category, noSubcategories, tagId) { href(filterType, category, noSubcategories, tagId) {
let customHref = null; let customHref = null;
NavItem.customNavItemHrefs.forEach(function(cb) { NavItem.customNavItemHrefs.forEach(function(cb) {
@ -49,9 +50,11 @@ const NavItem = EmberObject.extend({
} }
const context = { category, noSubcategories, tagId }; const context = { category, noSubcategories, tagId };
return NavItem.pathFor(filterMode, context); return NavItem.pathFor(filterType, context);
}, },
filterType: reads("name"),
@discourseComputed("name", "category", "noSubcategories") @discourseComputed("name", "category", "noSubcategories")
filterMode(name, category, noSubcategories) { filterMode(name, category, noSubcategories) {
let mode = ""; let mode = "";