From 939fae35001e2af929bd24b459d53d4fc206ce3d Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Wed, 22 Jul 2020 12:55:23 -0400 Subject: [PATCH] REFACTOR: Remove `Discourse.SiteSettimgs` from @setting decorator --- app/assets/javascripts/discourse/app/lib/computed.js | 2 +- test/javascripts/lib/computed-test.js | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/app/assets/javascripts/discourse/app/lib/computed.js b/app/assets/javascripts/discourse/app/lib/computed.js index b4a6d4ed078..51292ae13a4 100644 --- a/app/assets/javascripts/discourse/app/lib/computed.js +++ b/app/assets/javascripts/discourse/app/lib/computed.js @@ -162,6 +162,6 @@ export function endWith() { **/ export function setting(name) { return computed(function() { - return Discourse.SiteSettings[name]; + return this.siteSettings[name]; }); } diff --git a/test/javascripts/lib/computed-test.js b/test/javascripts/lib/computed-test.js index 7d9f39c4c7c..60aee875b64 100644 --- a/test/javascripts/lib/computed-test.js +++ b/test/javascripts/lib/computed-test.js @@ -25,7 +25,8 @@ discourseModule("lib:computed", { }); QUnit.test("setting", function(assert) { - var t = EmberObject.extend({ + let t = EmberObject.extend({ + siteSettings: this.siteSettings, vehicle: setting("vehicle"), missingProp: setting("madeUpThing") }).create();