IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

DEV: Replace site-settings:main with service:site-settings (#17734)

Browse Source 
This will allow consumers to inject it using `siteSettings: service()` in preparation for the removal of implicit injections in Ember 4.0. `site-settings:main` is still available and will print a deprecation notice.
This commit is contained in:
David Taylor
2022-08-01 09:43:33 +01:00
committed by GitHub
parent ad6b5825bf
commit 9534f13256
27 changed files with 58 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
plugins/discourse-local-dates/assets/javascripts/initializers/discourse-local-dates.js
View File

@@ -109,7 +109,7 @@ function _rangeElements(element) {
}
function initializeDiscourseLocalDates(api) {
const siteSettings = api.container.lookup("site-settings:main");
const siteSettings = api.container.lookup("service:site-settings");
const defaultTitle = I18n.t("discourse_local_dates.default_title", {
site_name: siteSettings.title,
});
@@ -336,7 +336,7 @@ export default {
return;
}
const siteSettings = owner.lookup("site-settings:main");
const siteSettings = owner.lookup("service:site-settings");
showPopover(event, {
trigger: "click",
@@ -357,7 +357,7 @@ export default {
initialize(container) {
window.addEventListener("click", this.showDatePopover);
const siteSettings = container.lookup("site-settings:main");
const siteSettings = container.lookup("service:site-settings");
if (siteSettings.discourse_local_dates_enabled) {
$.fn.applyLocalDates = function () {
deprecated(

2
plugins/discourse-narrative-bot/assets/javascripts/initializers/new-user-narrative.js
View File

@@ -119,7 +119,7 @@ export default {
name: "new-user-narratve",
initialize(container) {
const siteSettings = container.lookup("site-settings:main");
const siteSettings = container.lookup("service:site-settings");
if (siteSettings.discourse_narrative_bot_enabled) {
withPluginApi("0.8.7", initialize);
}

5
plugins/poll/assets/javascripts/initializers/extend-for-poll.js
View File

@@ -24,8 +24,9 @@ function cleanUpPolls() {
function initializePolls(api) {
const register = getRegister(api),
pollGroupableUserFields =
api.container.lookup("site-settings:main").poll_groupable_user_fields;
pollGroupableUserFields = api.container.lookup(
"service:site-settings"
).poll_groupable_user_fields;
cleanUpPolls();
api.modifyClass("controller:topic", {