github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-06-15 12:31:28 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

REFACTOR: Remove Discourse constants from nav-item

Browse Source
This commit is contained in:
Robin Ward
2020-08-19 15:10:19 -04:00
parent c068098f75
commit 185ed80702
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -8,6 +8,7 @@ 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";
import { getOwner } from "discourse-common/lib/get-owner";
const NavItem = EmberObject.extend({ const NavItem = EmberObject.extend({
@discourseComputed("name") @discourseComputed("name")
@ -182,7 +183,7 @@ NavItem.reopenClass({
_.merge(args, cb.call(this, filterType, opts)) _.merge(args, cb.call(this, filterType, opts))
); );
const store = Discourse.__container__.lookup("service:store"); let store = getOwner(this).lookup("service:store");
return store.createRecord("nav-item", args); return store.createRecord("nav-item", args);
}, },
@ -198,7 +199,7 @@ NavItem.reopenClass({
since: "2.6.0", since: "2.6.0",
dropFrom: "2.7.0" dropFrom: "2.7.0"
}); });
args.siteSettings = Discourse.SiteSettings; args.siteSettings = getOwner(this).lookup("site-settings:main");
} }
let items = args.siteSettings.top_menu.split("|"); let items = args.siteSettings.top_menu.split("|");