tools
/
doomsday
1
0
Fork 1
Code Issues 6 Pull Requests Releases Activity

Work around issue moment/luxon#1167

This commit is contained in:
Florine W. Dekker 2022-03-29 16:20:38 +02:00
parent 5096c171f6
commit 667bec2263
Signed by: FWDekker
GPG Key ID: D3DCFAA8A4560BE0
4 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Gruntfile.js
View File

@ -50,7 +50,7 @@ module.exports = grunt => {
files: ["src/main/**/*.html"], files: ["src/main/**/*.html"],
tasks: ["copy:html"], tasks: ["copy:html"],
}, },
js: { ts: {
files: ["src/main/**/*.ts"], files: ["src/main/**/*.ts"],
tasks: ["webpack:dev", "replace:dev"], tasks: ["webpack:dev", "replace:dev"],
}, },

BIN
package-lock.json generated
View File

Binary file not shown.

6
package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "doomsday", "name": "doomsday",
"version": "1.4.0", "version": "1.4.1",
"description": "Test your mastery of Conway's Doomsday rule.", "description": "Test your mastery of Conway's Doomsday rule.",
"author": "Florine W. Dekker", "author": "Florine W. Dekker",
"browser": "dist/bundle.js", "browser": "dist/bundle.js",
@ -19,7 +19,7 @@
"luxon": "^2.3.1" "luxon": "^2.3.1"
}, },
"devDependencies": { "devDependencies": {
"@types/luxon": "^2.3.0", "@types/luxon": "^2.3.1",
"grunt": "^1.4.1", "grunt": "^1.4.1",
"grunt-cli": "^1.4.3", "grunt-cli": "^1.4.3",
"grunt-contrib-clean": "^2.0.0", "grunt-contrib-clean": "^2.0.0",
@ -29,7 +29,7 @@
"grunt-text-replace": "^0.4.0", "grunt-text-replace": "^0.4.0",
"grunt-webpack": "^5.0.0", "grunt-webpack": "^5.0.0",
"ts-loader": "^9.2.8", "ts-loader": "^9.2.8",
"typescript": "^4.6.2", "typescript": "^4.6.3",
"webpack": "^5.70.0", "webpack": "^5.70.0",
"webpack-cli": "^4.9.2" "webpack-cli": "^4.9.2"
} }

15
src/main/js/Main.ts
View File

@ -24,15 +24,15 @@ class ValidatableInput {
/** /**
* The input that is validatable. * The input that is validatable.
*/ */
readonly input: HTMLInputElement readonly input: HTMLInputElement;
/** /**
* The label of which to update the text. * The label of which to update the text.
*/ */
readonly titleLabel: HTMLElement readonly titleLabel: HTMLElement;
/** /**
* The submission button that activates validation. * The submission button that activates validation.
*/ */
readonly button: HTMLButtonElement readonly button: HTMLButtonElement;
/** /**
@ -285,7 +285,8 @@ class DoomsdayDate {
* @return the day of the week of the anchor of this `DoomsdayDate`'s century * @return the day of the week of the anchor of this `DoomsdayDate`'s century
*/ */
getCenturyAnchorString(): string { getCenturyAnchorString(): string {
return this.date.set({year: this.getCentury() * 100, month: 4, day: 4}).setLocale("en-US").weekdayLong; // TODO: Support BCE years
return this.date.set({year: (this.getCentury() + 4) * 100, month: 4, day: 4}).setLocale("en-US").weekdayLong;
}; };
/** /**
@ -294,7 +295,8 @@ class DoomsdayDate {
* @return the day of the week of the anchor day of this `DoomsdayDate`'s year * @return the day of the week of the anchor day of this `DoomsdayDate`'s year
*/ */
getYearAnchorString(): string { getYearAnchorString(): string {
return this.date.set({day: 4, month: 4}).setLocale("en-US").weekdayLong; // TODO: Support BCE years
return this.date.set({year: this.date.year + 400, day: 4, month: 4}).setLocale("en-US").weekdayLong;
}; };
/** /**
@ -303,7 +305,8 @@ class DoomsdayDate {
* @return the day of the week of this `DoomsdayDate` * @return the day of the week of this `DoomsdayDate`
*/ */
getWeekdayString(): string { getWeekdayString(): string {
return this.date.setLocale("en-US").weekdayLong; // TODO: Support BCE years
return this.date.set({year: this.date.year + 400}).setLocale("en-US").weekdayLong;
}; };