github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-22 21:31:04 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

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
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;

22
plugins/discourse-local-dates/test/javascripts/acceptance/local-dates-composer-test.js
View File

@ -1,6 +1,11 @@
import { acceptance, queryAll } from "discourse/tests/helpers/qunit-helpers";
import {
acceptance,
query,
queryAll,
} from "discourse/tests/helpers/qunit-helpers";
import { test } from "qunit";
import { click, fillIn, visit } from "@ember/test-helpers";
import selectKit from "discourse/tests/helpers/select-kit-helper";
acceptance("Local Dates - composer", function (needs) {
needs.user();
@ -61,4 +66,19 @@ acceptance("Local Dates - composer", function (needs) {
);
assert.notOk(getAttr("time"), "it doesn’t have time");
});
test("date modal", async function (assert) {
await visit("/");
await click("#create-topic");
await click(".d-editor-button-bar .local-dates");
const timezoneChooser = selectKit(".timezone-input");
await timezoneChooser.expand();
await timezoneChooser.selectRowByValue("Asia/Macau");
assert.ok(
query(".preview .discourse-local-date").textContent.includes("Macau"),
"it outputs a preview date in selected timezone"
);
});
});