Discourse/discourse
Discourse/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-09-11 21:04:42 +08:00
Code Packages Activity Actions 10

DEV: Include helper in core for applyLocalDates (#16325)

Browse source
This commit is contained in:
Penar Musaraj 2022-03-30 20:58:38 -04:00 • committed by GitHub
parent 57b20393ac
commit 943083f4df
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 52 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

14
plugins/discourse-local-dates/assets/javascripts/discourse/components/discourse-local-dates-create-form.js
View file

@ -13,6 +13,7 @@ import { notEmpty } from "@ember/object/computed";
import { propertyNotEqual } from "discourse/lib/computed";
import { schedule } from "@ember/runloop";
import { getOwner } from "discourse-common/lib/get-owner";
import { applyLocalDates } from "discourse/lib/local-dates";

export default Component.extend({
timeFormat: "HH:mm:ss",
@ -56,19 +57,21 @@ export default Component.extend({
});
},

@observes("markup")
@observes("computedConfig.{from,to,options}", "options", "isValid", "isRange")
_renderPreview() {
discourseDebounce(
this,
function () {
const markup = this.markup;

if (markup) {
cookAsync(markup).then((result) => {
this.set("currentPreview", result);
schedule("afterRender", () =>
this.$(".preview .discourse-local-date").applyLocalDates()
);
schedule("afterRender", () => {
applyLocalDates(
document.querySelectorAll(".preview .discourse-local-date"),
this.siteSettings
);
});
});
}
},
@ -321,7 +324,6 @@ export default Component.extend({
text = this._generateDateMarkup(config.from, options, isRange);
}
}

return text;
},


1
plugins/discourse-local-dates/assets/javascripts/initializers/discourse-local-dates.js
View file

@ -8,6 +8,7 @@ import { downloadCalendar } from "discourse/lib/download-calendar";
import { renderIcon } from "discourse-common/lib/icon-library";
import I18n from "I18n";

// Import applyLocalDates from discourse/lib/local-dates instead
export function applyLocalDates(dates, siteSettings) {
if (!siteSettings.discourse_local_dates_enabled) {
return;