Merge pull request 'Use proper date library' (#14) from dev into master
Reviewed-on: #14
This commit is contained in:
commit
88348087bd
11
Gruntfile.js
11
Gruntfile.js
|
@ -16,7 +16,7 @@ module.exports = grunt => {
|
||||||
},
|
},
|
||||||
focus: {
|
focus: {
|
||||||
dev: {
|
dev: {
|
||||||
include: ["css", "html", "js"],
|
include: ["css", "html", "ts"],
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
replace: {
|
replace: {
|
||||||
|
@ -51,23 +51,24 @@ module.exports = grunt => {
|
||||||
tasks: ["copy:html"],
|
tasks: ["copy:html"],
|
||||||
},
|
},
|
||||||
js: {
|
js: {
|
||||||
files: ["src/main/**/*.js"],
|
files: ["src/main/**/*.ts"],
|
||||||
tasks: ["webpack:dev", "replace:dev"],
|
tasks: ["webpack:dev", "replace:dev"],
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
webpack: {
|
webpack: {
|
||||||
options: {
|
options: {
|
||||||
entry: "./src/main/js/main.js",
|
entry: "./src/main/js/Main.ts",
|
||||||
module: {
|
module: {
|
||||||
rules: [
|
rules: [
|
||||||
{
|
{
|
||||||
test: /\.js$/,
|
test: /\.ts$/,
|
||||||
|
use: "ts-loader",
|
||||||
exclude: /node_modules/,
|
exclude: /node_modules/,
|
||||||
},
|
},
|
||||||
],
|
],
|
||||||
},
|
},
|
||||||
resolve: {
|
resolve: {
|
||||||
extensions: [".js"],
|
extensions: [".ts"],
|
||||||
},
|
},
|
||||||
output: {
|
output: {
|
||||||
filename: "bundle.js",
|
filename: "bundle.js",
|
||||||
|
|
Binary file not shown.
10
package.json
10
package.json
|
@ -1,6 +1,6 @@
|
||||||
{
|
{
|
||||||
"name": "doomsday",
|
"name": "doomsday",
|
||||||
"version": "1.3.19",
|
"version": "1.4.0",
|
||||||
"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",
|
||||||
|
@ -15,7 +15,11 @@
|
||||||
"dev:server": "grunt dev:server",
|
"dev:server": "grunt dev:server",
|
||||||
"deploy": "grunt deploy"
|
"deploy": "grunt deploy"
|
||||||
},
|
},
|
||||||
|
"dependencies": {
|
||||||
|
"luxon": "^2.3.1"
|
||||||
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
|
"@types/luxon": "^2.3.0",
|
||||||
"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",
|
||||||
|
@ -24,7 +28,9 @@
|
||||||
"grunt-focus": "^1.0.0",
|
"grunt-focus": "^1.0.0",
|
||||||
"grunt-text-replace": "^0.4.0",
|
"grunt-text-replace": "^0.4.0",
|
||||||
"grunt-webpack": "^5.0.0",
|
"grunt-webpack": "^5.0.0",
|
||||||
"webpack": "^5.69.1",
|
"ts-loader": "^9.2.8",
|
||||||
|
"typescript": "^4.6.2",
|
||||||
|
"webpack": "^5.70.0",
|
||||||
"webpack-cli": "^4.9.2"
|
"webpack-cli": "^4.9.2"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,6 +1,8 @@
|
||||||
// noinspection JSUnresolvedVariable
|
// @ts-ignore
|
||||||
const {$, doAfterLoad, footer, header, nav} = window.fwdekker;
|
const {$, doAfterLoad, footer, header, nav} = window.fwdekker;
|
||||||
|
|
||||||
|
import {DateTime} from "luxon";
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Returns a number between `min` (inclusive) and `max` (inclusive).
|
* Returns a number between `min` (inclusive) and `max` (inclusive).
|
||||||
|
@ -8,7 +10,7 @@ const {$, doAfterLoad, footer, header, nav} = window.fwdekker;
|
||||||
* @param min the lower bound of permissible values
|
* @param min the lower bound of permissible values
|
||||||
* @param max the upper bound of permissible values
|
* @param max the upper bound of permissible values
|
||||||
*/
|
*/
|
||||||
function generateRandom(min, max) {
|
function generateRandom(min: number, max: number) {
|
||||||
return Math.floor(Math.random() * (max - min + 1) + min);
|
return Math.floor(Math.random() * (max - min + 1) + min);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -17,20 +19,30 @@ function generateRandom(min, max) {
|
||||||
* An input that can be validated.
|
* An input that can be validated.
|
||||||
*
|
*
|
||||||
* In particular, the century, year, and day inputs of the Doomsday test.
|
* In particular, the century, year, and day inputs of the Doomsday test.
|
||||||
*
|
|
||||||
* @property input {HTMLInputElement} the input that is validatable
|
|
||||||
* @property titleLabel {HTMLElement} the label of which to update the text
|
|
||||||
* @property button {HTMLButtonElement} the submission button that activates validation
|
|
||||||
*/
|
*/
|
||||||
class ValidatableInput {
|
class ValidatableInput {
|
||||||
|
/**
|
||||||
|
* The input that is validatable.
|
||||||
|
*/
|
||||||
|
readonly input: HTMLInputElement
|
||||||
|
/**
|
||||||
|
* The label of which to update the text.
|
||||||
|
*/
|
||||||
|
readonly titleLabel: HTMLElement
|
||||||
|
/**
|
||||||
|
* The submission button that activates validation.
|
||||||
|
*/
|
||||||
|
readonly button: HTMLButtonElement
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Constructs a new validatable input and registers event listeners.
|
* Constructs a new validatable input and registers event listeners.
|
||||||
*
|
*
|
||||||
* @param input {HTMLInputElement} the input that is validatable
|
* @param input the input that is validatable
|
||||||
* @param titleLabel {HTMLElement} the label of which to update the text
|
* @param titleLabel the label of which to update the text
|
||||||
* @param button {HTMLButtonElement} the submission button that activates validation
|
* @param button the submission button that activates validation
|
||||||
*/
|
*/
|
||||||
constructor(input, titleLabel, button) {
|
constructor(input: HTMLInputElement, titleLabel: HTMLElement, button: HTMLButtonElement) {
|
||||||
this.input = input;
|
this.input = input;
|
||||||
this.titleLabel = titleLabel;
|
this.titleLabel = titleLabel;
|
||||||
this.button = button;
|
this.button = button;
|
||||||
|
@ -49,7 +61,7 @@ class ValidatableInput {
|
||||||
/**
|
/**
|
||||||
* Handles the user submitting the input.
|
* Handles the user submitting the input.
|
||||||
*/
|
*/
|
||||||
onSubmit() {
|
onSubmit(): void {
|
||||||
this.input.dataset["entered"] = "true";
|
this.input.dataset["entered"] = "true";
|
||||||
|
|
||||||
if (this.isValid(this.input.value)) {
|
if (this.isValid(this.input.value)) {
|
||||||
|
@ -67,10 +79,10 @@ class ValidatableInput {
|
||||||
*
|
*
|
||||||
* This method **must** be implemented by subclasses.
|
* This method **must** be implemented by subclasses.
|
||||||
*
|
*
|
||||||
* @param value {string} the value of the input to validate
|
* @param value the value of the input to validate
|
||||||
* @return {boolean} `true` if and only if the input is valid
|
* @return `true` if and only if the input is valid
|
||||||
*/
|
*/
|
||||||
isValid(value) {
|
isValid(value: string): boolean {
|
||||||
throw new Error("Implement this method.");
|
throw new Error("Implement this method.");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -79,7 +91,7 @@ class ValidatableInput {
|
||||||
*
|
*
|
||||||
* This method **must** be implemented by subclasses.
|
* This method **must** be implemented by subclasses.
|
||||||
*/
|
*/
|
||||||
onValidInput() {
|
onValidInput(): void {
|
||||||
throw new Error("Implement this method.");
|
throw new Error("Implement this method.");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -88,7 +100,7 @@ class ValidatableInput {
|
||||||
*
|
*
|
||||||
* This method **must** be implemented by subclasses.
|
* This method **must** be implemented by subclasses.
|
||||||
*/
|
*/
|
||||||
onInvalidInput() {
|
onInvalidInput(): void {
|
||||||
throw new Error("Implement this method.");
|
throw new Error("Implement this method.");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -96,7 +108,7 @@ class ValidatableInput {
|
||||||
/**
|
/**
|
||||||
* Resets the input, title, and error message to their initial state, and removes the value from the input.
|
* Resets the input, title, and error message to their initial state, and removes the value from the input.
|
||||||
*/
|
*/
|
||||||
reset() {
|
reset(): void {
|
||||||
this.input.value = "";
|
this.input.value = "";
|
||||||
this.input.dataset["entered"] = "false";
|
this.input.dataset["entered"] = "false";
|
||||||
|
|
||||||
|
@ -110,7 +122,7 @@ class ValidatableInput {
|
||||||
/**
|
/**
|
||||||
* Marks the input as invalid.
|
* Marks the input as invalid.
|
||||||
*/
|
*/
|
||||||
showError() {
|
showError(): void {
|
||||||
this.input.setCustomValidity("Incorrect");
|
this.input.setCustomValidity("Incorrect");
|
||||||
|
|
||||||
this.titleLabel.classList.remove("success-message");
|
this.titleLabel.classList.remove("success-message");
|
||||||
|
@ -123,7 +135,7 @@ class ValidatableInput {
|
||||||
/**
|
/**
|
||||||
* Marks the input as valid.
|
* Marks the input as valid.
|
||||||
*/
|
*/
|
||||||
showSuccess() {
|
showSuccess(): void {
|
||||||
this.input.setCustomValidity("");
|
this.input.setCustomValidity("");
|
||||||
|
|
||||||
this.titleLabel.classList.remove("error-message");
|
this.titleLabel.classList.remove("error-message");
|
||||||
|
@ -138,7 +150,7 @@ class ValidatableInput {
|
||||||
*
|
*
|
||||||
* Does nothing by default. Implement this method to make it do something.
|
* Does nothing by default. Implement this method to make it do something.
|
||||||
*/
|
*/
|
||||||
updateTitle() {
|
updateTitle(): void {
|
||||||
// Do nothing
|
// Do nothing
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -146,7 +158,7 @@ class ValidatableInput {
|
||||||
/**
|
/**
|
||||||
* Focuses the input element.
|
* Focuses the input element.
|
||||||
*/
|
*/
|
||||||
selectInput() {
|
selectInput(): void {
|
||||||
this.input.select();
|
this.input.select();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -155,46 +167,60 @@ class ValidatableInput {
|
||||||
* A wrapper around a `<details>` element that persists the state in local storage.
|
* A wrapper around a `<details>` element that persists the state in local storage.
|
||||||
*/
|
*/
|
||||||
class ToggleableSection {
|
class ToggleableSection {
|
||||||
|
/**
|
||||||
|
* The name to identify this component with in persistent storage.
|
||||||
|
*
|
||||||
|
* @private
|
||||||
|
*/
|
||||||
|
private readonly name: string;
|
||||||
|
/**
|
||||||
|
* The element that can be toggled.
|
||||||
|
*
|
||||||
|
* @private
|
||||||
|
*/
|
||||||
|
private readonly details: HTMLDetailsElement;
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Constructs a new `ToggleableSection`.
|
* Constructs a new `ToggleableSection`.
|
||||||
*
|
*
|
||||||
* @param name {string} the name to identify this component with in persistent storage
|
* @param name the name to identify this component with in persistent storage
|
||||||
* @param details {HTMLDetailsElement} the element that can be toggled
|
* @param details the element that can be toggled
|
||||||
*/
|
*/
|
||||||
constructor(name, details) {
|
constructor(name: string, details: HTMLDetailsElement) {
|
||||||
this._name = name;
|
this.name = name;
|
||||||
this._details = details;
|
this.details = details;
|
||||||
this._details.addEventListener("toggle", () => this.onToggle(this.isOpened()));
|
this.details.addEventListener("toggle", () => this.onToggle(this.isOpened()));
|
||||||
|
|
||||||
this._loadToggle();
|
this.loadToggle();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Returns `true` if and only if the component is currently open.
|
* Returns `true` if and only if the component is currently open.
|
||||||
*
|
*
|
||||||
* @return {boolean} `true` if and only if the component is currently open.
|
* @return `true` if and only if the component is currently open.
|
||||||
*/
|
*/
|
||||||
isOpened() {
|
isOpened(): boolean {
|
||||||
return !!this._details.open;
|
return this.details.open;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Opens or closes the component.
|
* Opens or closes the component.
|
||||||
*
|
*
|
||||||
* @param isOpened {boolean} whether to open the component
|
* @param isOpened whether to open the component
|
||||||
*/
|
*/
|
||||||
setOpened(isOpened) {
|
setOpened(isOpened: boolean): void {
|
||||||
this._details.open = isOpened;
|
this.details.open = isOpened;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* This method is invoked whenever the component is toggled.
|
* This method is invoked whenever the component is toggled.
|
||||||
*
|
*
|
||||||
* @param isOpened {boolean} the new state of the component
|
* @param isOpened the new state of the component
|
||||||
*/
|
*/
|
||||||
onToggle(isOpened) {
|
onToggle(isOpened: boolean): void {
|
||||||
this._storeToggle();
|
this.storeToggle();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -203,8 +229,8 @@ class ToggleableSection {
|
||||||
*
|
*
|
||||||
* @private
|
* @private
|
||||||
*/
|
*/
|
||||||
_storeToggle() {
|
private storeToggle(): void {
|
||||||
localStorage.setItem(`/tools/doomsday//toggle-${this._name}`, "" + this.isOpened());
|
localStorage.setItem(`/tools/doomsday//toggle-${this.name}`, "" + this.isOpened());
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -212,11 +238,11 @@ class ToggleableSection {
|
||||||
*
|
*
|
||||||
* @private
|
* @private
|
||||||
*/
|
*/
|
||||||
_loadToggle() {
|
private loadToggle(): void {
|
||||||
const target = localStorage.getItem(`/tools/doomsday//toggle-${this._name}`);
|
const target = localStorage.getItem(`/tools/doomsday//toggle-${this.name}`);
|
||||||
if (target === null) {
|
if (target === null) {
|
||||||
this.setOpened(true);
|
this.setOpened(true);
|
||||||
this._storeToggle();
|
this.storeToggle();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -226,16 +252,20 @@ class ToggleableSection {
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* A wrapper around the good ol' `Date` class that provides a bunch of useful Doomsday-specific methods.
|
* A wrapper around the good ol' `Date` class that provides a bunch of useful Doomsday-specific methods.
|
||||||
*
|
|
||||||
* @property {Date} date the underlying date
|
|
||||||
*/
|
*/
|
||||||
class DoomsdayDate {
|
class DoomsdayDate {
|
||||||
|
/**
|
||||||
|
* The underlying date.
|
||||||
|
*/
|
||||||
|
readonly date: DateTime;
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Wraps a `DoomsdayDate` around the given date.
|
* Wraps a `DoomsdayDate` around the given date.
|
||||||
*
|
*
|
||||||
* @param date {Date} the date to be wrapped
|
* @param date the date to be wrapped
|
||||||
*/
|
*/
|
||||||
constructor(date) {
|
constructor(date: DateTime) {
|
||||||
this.date = date;
|
this.date = date;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -243,83 +273,49 @@ class DoomsdayDate {
|
||||||
/**
|
/**
|
||||||
* Returns the number of this `DoomsdayDate`'s century.
|
* Returns the number of this `DoomsdayDate`'s century.
|
||||||
*
|
*
|
||||||
* @return {number} the number of this `DoomsdayDate`'s century
|
* @return the number of this `DoomsdayDate`'s century
|
||||||
*/
|
*/
|
||||||
getCentury() {
|
getCentury(): number {
|
||||||
return Math.floor(this.date.getFullYear() / 100);
|
return Math.floor(this.date.year / 100);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Returns the day of the week of the anchor of this `DoomsdayDate`'s century.
|
* Returns the day of the week of the anchor of this `DoomsdayDate`'s century.
|
||||||
*
|
*
|
||||||
* @return {string} 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() {
|
getCenturyAnchorString(): string {
|
||||||
const centuryAnchorNumber = (5 * (this.getCentury() % 4)) % 7 + 2;
|
return this.date.set({year: this.getCentury() * 100, month: 4, day: 4}).setLocale("en-US").weekdayLong;
|
||||||
return DoomsdayDate.getWeekDayOf(centuryAnchorNumber);
|
|
||||||
};
|
};
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Returns the day of the week of the anchor day of this `DoomsdayDate`'s year.
|
* Returns the day of the week of the anchor day of this `DoomsdayDate`'s year.
|
||||||
*
|
*
|
||||||
* @return {string} 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() {
|
getYearAnchorString(): string {
|
||||||
const anchorDate = new Date(this.date);
|
return this.date.set({day: 4, month: 4}).setLocale("en-US").weekdayLong;
|
||||||
anchorDate.setDate(4); // 4th
|
|
||||||
anchorDate.setMonth(3); // April
|
|
||||||
anchorDate.setHours(0); // midnight local time
|
|
||||||
return DoomsdayDate.getWeekDayOf(anchorDate);
|
|
||||||
};
|
};
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Returns the day of the week of this `DoomsdayDate`.
|
* Returns the day of the week of this `DoomsdayDate`.
|
||||||
*
|
*
|
||||||
* @return {string} the day of the week of this `DoomsdayDate`
|
* @return the day of the week of this `DoomsdayDate`
|
||||||
*/
|
*/
|
||||||
getWeekdayString() {
|
getWeekdayString(): string {
|
||||||
return DoomsdayDate.getWeekDayOf(this.date);
|
return this.date.setLocale("en-US").weekdayLong;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Returns the week day of [date].
|
* Returns the day of the week corresponding to `dayString`, or an empty string if no day was recognized.
|
||||||
*
|
|
||||||
* @param date {Date|number} the date to get the week day of; if it is a `number`, then 0 corresponds to Sunday
|
|
||||||
* @return {string} the name of the week day corresponding to [date]
|
|
||||||
*/
|
|
||||||
static getWeekDayOf(date) {
|
|
||||||
if (date instanceof Date) {
|
|
||||||
return date.toLocaleString("en-US", {weekday: "long"});
|
|
||||||
} else {
|
|
||||||
switch (date % 7) {
|
|
||||||
case 0:
|
|
||||||
return "Sunday";
|
|
||||||
case 1:
|
|
||||||
return "Monday";
|
|
||||||
case 2:
|
|
||||||
return "Tuesday";
|
|
||||||
case 3:
|
|
||||||
return "Wednesday";
|
|
||||||
case 4:
|
|
||||||
return "Thursday";
|
|
||||||
case 5:
|
|
||||||
return "Friday";
|
|
||||||
case 6:
|
|
||||||
return "Saturday";
|
|
||||||
}
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Returns the day of the week corresponding to the given string.
|
|
||||||
*
|
*
|
||||||
* This is a convenience method for interpreting (incomplete) user inputs.
|
* This is a convenience method for interpreting (incomplete) user inputs.
|
||||||
*
|
*
|
||||||
* @param dayString {string} the day of the week to expand
|
* @param dayString the day of the week to expand
|
||||||
* @return {string} the day of the week corresponding to the given string
|
* @return the day of the week corresponding to `dayString`, or an empty string if no day was recognized
|
||||||
*/
|
*/
|
||||||
static expandDayString(dayString) {
|
static expandDayString(dayString: string): string {
|
||||||
dayString = dayString.toLowerCase();
|
dayString = dayString.toLowerCase();
|
||||||
if (dayString.startsWith("m"))
|
if (dayString.startsWith("m"))
|
||||||
return "Monday";
|
return "Monday";
|
||||||
|
@ -336,7 +332,7 @@ class DoomsdayDate {
|
||||||
else if (dayString.startsWith("su"))
|
else if (dayString.startsWith("su"))
|
||||||
return "Sunday";
|
return "Sunday";
|
||||||
else
|
else
|
||||||
return undefined;
|
return "";
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -347,9 +343,9 @@ class DoomsdayDate {
|
||||||
*/
|
*/
|
||||||
static random() {
|
static random() {
|
||||||
// TODO Give custom date range to this method
|
// TODO Give custom date range to this method
|
||||||
const minDate = new Date("0001-01-01").getTime() / 86400000;
|
const startDate = DateTime.utc(1, 1, 1);
|
||||||
const maxDate = new Date("9999-12-31").getTime() / 86400000;
|
const dayRange = 9999 * 365 + (10000 / 400 * 97) - 1;
|
||||||
return new DoomsdayDate(new Date(generateRandom(minDate, maxDate) * 86400000));
|
return new DoomsdayDate(startDate.plus({days: generateRandom(0, dayRange)}))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -372,17 +368,17 @@ doAfterLoad(() => {
|
||||||
|
|
||||||
|
|
||||||
// Initialize quiz
|
// Initialize quiz
|
||||||
let quizDate;
|
let quizDate: DoomsdayDate;
|
||||||
|
|
||||||
const centuryDetails = new class extends ToggleableSection {
|
const centuryDetails = new class extends ToggleableSection {
|
||||||
onToggle(isOpened) {
|
onToggle(isOpened: boolean): void {
|
||||||
super.onToggle(isOpened);
|
super.onToggle(isOpened);
|
||||||
if (isOpened) centuryInput.selectInput();
|
if (isOpened) centuryInput.selectInput();
|
||||||
centuryInput.updateTitle();
|
centuryInput.updateTitle();
|
||||||
}
|
}
|
||||||
}("century", $("#century-details"));
|
}("century", $("#century-details"));
|
||||||
const yearDetails = new class extends ToggleableSection {
|
const yearDetails = new class extends ToggleableSection {
|
||||||
onToggle(isOpened) {
|
onToggle(isOpened: boolean): void {
|
||||||
super.onToggle(isOpened);
|
super.onToggle(isOpened);
|
||||||
if (isOpened) yearInput.selectInput();
|
if (isOpened) yearInput.selectInput();
|
||||||
yearInput.updateTitle();
|
yearInput.updateTitle();
|
||||||
|
@ -390,7 +386,7 @@ doAfterLoad(() => {
|
||||||
}("year", $("#year-details"));
|
}("year", $("#year-details"));
|
||||||
|
|
||||||
const centuryInput = new class extends ValidatableInput {
|
const centuryInput = new class extends ValidatableInput {
|
||||||
isValid(value) {
|
isValid(value: string): boolean {
|
||||||
console.log("# Validate century");
|
console.log("# Validate century");
|
||||||
console.log(`Input: ${value}`);
|
console.log(`Input: ${value}`);
|
||||||
console.log(`Expanded: ${DoomsdayDate.expandDayString(value)}`);
|
console.log(`Expanded: ${DoomsdayDate.expandDayString(value)}`);
|
||||||
|
@ -398,7 +394,7 @@ doAfterLoad(() => {
|
||||||
return DoomsdayDate.expandDayString(value) === quizDate.getCenturyAnchorString();
|
return DoomsdayDate.expandDayString(value) === quizDate.getCenturyAnchorString();
|
||||||
}
|
}
|
||||||
|
|
||||||
onValidInput() {
|
onValidInput(): void {
|
||||||
this.input.value = DoomsdayDate.expandDayString(this.input.value);
|
this.input.value = DoomsdayDate.expandDayString(this.input.value);
|
||||||
if (yearDetails.isOpened())
|
if (yearDetails.isOpened())
|
||||||
yearInput.selectInput();
|
yearInput.selectInput();
|
||||||
|
@ -418,7 +414,7 @@ doAfterLoad(() => {
|
||||||
}
|
}
|
||||||
}($("#century-input"), $("#century-title-label"), $("#century-submit"));
|
}($("#century-input"), $("#century-title-label"), $("#century-submit"));
|
||||||
const yearInput = new class extends ValidatableInput {
|
const yearInput = new class extends ValidatableInput {
|
||||||
isValid(value) {
|
isValid(value: string): boolean {
|
||||||
console.log("# Validate year");
|
console.log("# Validate year");
|
||||||
console.log(`Input: ${value}`);
|
console.log(`Input: ${value}`);
|
||||||
console.log(`Expanded: ${DoomsdayDate.expandDayString(value)}`);
|
console.log(`Expanded: ${DoomsdayDate.expandDayString(value)}`);
|
||||||
|
@ -437,13 +433,13 @@ doAfterLoad(() => {
|
||||||
|
|
||||||
updateTitle() {
|
updateTitle() {
|
||||||
if (yearDetails.isOpened())
|
if (yearDetails.isOpened())
|
||||||
this.titleLabel.innerText = `Doomsday of year ${quizDate.date.getFullYear()}?`;
|
this.titleLabel.innerText = `Doomsday of year ${quizDate.date.year}?`;
|
||||||
else
|
else
|
||||||
this.titleLabel.innerText = `Year`;
|
this.titleLabel.innerText = `Year`;
|
||||||
}
|
}
|
||||||
}($("#year-input"), $("#year-title-label"), $("#year-submit"));
|
}($("#year-input"), $("#year-title-label"), $("#year-submit"));
|
||||||
const dayInput = new class extends ValidatableInput {
|
const dayInput = new class extends ValidatableInput {
|
||||||
isValid(value) {
|
isValid(value: string): boolean {
|
||||||
console.log("# Validate day");
|
console.log("# Validate day");
|
||||||
console.log(`Input: ${value}`);
|
console.log(`Input: ${value}`);
|
||||||
console.log(`Expanded: ${DoomsdayDate.expandDayString(value)}`);
|
console.log(`Expanded: ${DoomsdayDate.expandDayString(value)}`);
|
||||||
|
@ -461,7 +457,7 @@ doAfterLoad(() => {
|
||||||
}
|
}
|
||||||
|
|
||||||
updateTitle() {
|
updateTitle() {
|
||||||
this.titleLabel.innerText = `Weekday of ${quizDate.date.toISOString().substr(0, 10)}?`;
|
this.titleLabel.innerText = `Weekday of ${quizDate.date.toISODate()}?`;
|
||||||
}
|
}
|
||||||
}($("#day-input"), $("#day-title-label"), $("#day-submit"));
|
}($("#day-input"), $("#day-title-label"), $("#day-submit"));
|
||||||
|
|
||||||
|
@ -479,7 +475,7 @@ doAfterLoad(() => {
|
||||||
function reloadQuiz() {
|
function reloadQuiz() {
|
||||||
quizDate = DoomsdayDate.random();
|
quizDate = DoomsdayDate.random();
|
||||||
console.log("# Reset");
|
console.log("# Reset");
|
||||||
console.log(`New date: ${quizDate.date.toISOString().substr(0, 10)}`);
|
console.log(`New date: ${quizDate.date.toISODate()}`);
|
||||||
console.log(` ${quizDate.date}`);
|
console.log(` ${quizDate.date}`);
|
||||||
console.log(`Century#: ${quizDate.getCentury()}`);
|
console.log(`Century#: ${quizDate.getCentury()}`);
|
||||||
console.log(`Century: ${quizDate.getCenturyAnchorString()}`);
|
console.log(`Century: ${quizDate.getCenturyAnchorString()}`);
|
|
@ -0,0 +1,11 @@
|
||||||
|
{
|
||||||
|
"compilerOptions": {
|
||||||
|
"target": "es6",
|
||||||
|
"strict": true,
|
||||||
|
"rootDir": "./src/main/js/",
|
||||||
|
"outDir": "./dist/js/"
|
||||||
|
},
|
||||||
|
"include": [
|
||||||
|
"src/main/js/**/*.ts"
|
||||||
|
]
|
||||||
|
}
|
Loading…
Reference in New Issue