From 185ed80702dec6db0a3cd6f15a2f262d987d10fe Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Wed, 19 Aug 2020 15:10:19 -0400 Subject: [PATCH] REFACTOR: Remove `Discourse` constants from nav-item --- app/assets/javascripts/discourse/app/models/nav-item.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/assets/javascripts/discourse/app/models/nav-item.js b/app/assets/javascripts/discourse/app/models/nav-item.js index 22c4fd8a31..6597ae955b 100644 --- a/app/assets/javascripts/discourse/app/models/nav-item.js +++ b/app/assets/javascripts/discourse/app/models/nav-item.js @@ -8,6 +8,7 @@ import { reads } from "@ember/object/computed"; import deprecated from "discourse-common/lib/deprecated"; import Site from "discourse/models/site"; import User from "discourse/models/user"; +import { getOwner } from "discourse-common/lib/get-owner"; const NavItem = EmberObject.extend({ @discourseComputed("name") @@ -182,7 +183,7 @@ NavItem.reopenClass({ _.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); }, @@ -198,7 +199,7 @@ NavItem.reopenClass({ since: "2.6.0", dropFrom: "2.7.0" }); - args.siteSettings = Discourse.SiteSettings; + args.siteSettings = getOwner(this).lookup("site-settings:main"); } let items = args.siteSettings.top_menu.split("|");