Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

FIX: Make time attribute as optional for local-dates bbcode

This commit is contained in:
Vinoth Kannan 2018-10-12 05:44:00 +05:30
parent a1c912b630
commit f07bece17f
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -101,7 +101,7 @@
var options = {}; var options = {};
options.format = $this.attr("data-format"); options.format = $this.attr("data-format");
options.date = $this.attr("data-date"); options.date = $this.attr("data-date");
options.time = $this.attr("data-time"); options.time = $this.attr("data-time") || "00:00:00";
options.recurring = $this.attr("data-recurring"); options.recurring = $this.attr("data-recurring");
options.timezones = $this.attr("data-timezones"); options.timezones = $this.attr("data-timezones");
options.forceTimezone = $this.attr("data-force-timezone"); options.forceTimezone = $this.attr("data-force-timezone");

12
plugins/discourse-local-dates/test/javascripts/acceptance/local-dates-test.js.es6
View File

@ -20,6 +20,16 @@ test("local dates bbcode", async assert => {
assert.ok( assert.ok(
exists(".d-editor-preview .discourse-local-date.past.cooked-date"), exists(".d-editor-preview .discourse-local-date.past.cooked-date"),
"it should contain the cooked date output" "it should contain the cooked output for date & time inputs"
);
await fillIn(
".d-editor-input",
'[date=2017-10-23 format="LL" timezone="Asia/Calcutta" timezones="Europe/Paris|America/Los_Angeles"]'
);
assert.ok(
exists(".d-editor-preview .discourse-local-date.past.cooked-date"),
"it should contain the cooked output for date only input"
); );
}); });