From 9aab81f3048a3ff659a94c474e4ce13864e295b6 Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Tue, 21 Jul 2020 12:33:14 -0400 Subject: [PATCH] REFACTOR: Remove `Discourse.SiteSettings` from components --- .../discourse/app/components/edit-category-general.js | 2 +- .../javascripts/discourse/app/components/flag-action-type.js | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/app/assets/javascripts/discourse/app/components/edit-category-general.js b/app/assets/javascripts/discourse/app/components/edit-category-general.js index 931e8923fb6..e4a3a52ac38 100644 --- a/app/assets/javascripts/discourse/app/components/edit-category-general.js +++ b/app/assets/javascripts/discourse/app/components/edit-category-general.js @@ -76,7 +76,7 @@ export default buildCategoryPanel("general", { parentCategories() { return this.site .get("categoriesList") - .filter(c => c.level + 1 < Discourse.SiteSettings.max_category_nesting); + .filter(c => c.level + 1 < this.siteSettings.max_category_nesting); }, @discourseComputed( diff --git a/app/assets/javascripts/discourse/app/components/flag-action-type.js b/app/assets/javascripts/discourse/app/components/flag-action-type.js index 50f041d9b21..bfa916db78a 100644 --- a/app/assets/javascripts/discourse/app/components/flag-action-type.js +++ b/app/assets/javascripts/discourse/app/components/flag-action-type.js @@ -42,8 +42,7 @@ export default Component.extend({ @discourseComputed("message.length") customMessageLengthClasses(messageLength) { - return messageLength < - Discourse.SiteSettings.min_personal_message_post_length + return messageLength < this.siteSettings.min_personal_message_post_length ? "too-short" : "ok"; }, @@ -51,7 +50,7 @@ export default Component.extend({ @discourseComputed("message.length") customMessageLength(messageLength) { const len = messageLength || 0; - const minLen = Discourse.SiteSettings.min_personal_message_post_length; + const minLen = this.siteSettings.min_personal_message_post_length; if (len === 0) { return I18n.t("flagging.custom_message.at_least", { count: minLen }); } else if (len < minLen) {