Skip to content

Commit

Permalink
Merge latest changes from 'master' into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
Hexagon committed Jan 25, 2024
2 parents c649a69 + 06dea29 commit 7f3d921
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
6 changes: 3 additions & 3 deletions src/croner.js
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,7 @@ Cron.prototype.getPattern = function () {
};

/**
* Indicates wether or not the cron job is scheduled and running, e.g. awaiting next trigger
* Indicates whether or not the cron job is scheduled and running, e.g. awaiting next trigger
* @public
*
* @returns {boolean} - Running or not
Expand All @@ -250,7 +250,7 @@ Cron.prototype.isRunning = function () {
};

/**
* Indicates wether or not the cron job is permanently stopped
* Indicates whether or not the cron job is permanently stopped
* @public
*
* @returns {boolean} - Running or not
Expand All @@ -260,7 +260,7 @@ Cron.prototype.isStopped = function () {
};

/**
* Indicates wether or not the cron job is currently working
* Indicates whether or not the cron job is currently working
* @public
*
* @returns {boolean} - Running or not
Expand Down
2 changes: 1 addition & 1 deletion test/node/js/src/suites/timezone.cjs
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ module.exports = function (Cron, test) {
let timeStockholm = Cron("* * * * * *", {timezone: "Europe/Stockholm"}).nextRun().getTime(),
timeNewYork = Cron("* * * * * *", {timezone: "America/New_York"}).nextRun().getTime();

// The time right now should be the same in utc wether in new york or stockholm. Allow a 4 second difference.
// The time right now should be the same in utc whether in new york or stockholm. Allow a 4 second difference.
assert.ok(timeStockholm>=timeNewYork-4000);
assert.ok(timeStockholm<=timeNewYork+4000);
});
Expand Down
6 changes: 3 additions & 3 deletions types/croner.d.cts
Original file line number Diff line number Diff line change
Expand Up @@ -57,21 +57,21 @@ declare class Cron {
*/
getPattern(): string | undefined;
/**
* Indicates wether or not the cron job is scheduled and running, e.g. awaiting next trigger
* Indicates whether or not the cron job is scheduled and running, e.g. awaiting next trigger
* @public
*
* @returns {boolean} - Running or not
*/
public isRunning(): boolean;
/**
* Indicates wether or not the cron job is permanently stopped
* Indicates whether or not the cron job is permanently stopped
* @public
*
* @returns {boolean} - Running or not
*/
public isStopped(): boolean;
/**
* Indicates wether or not the cron job is currently working
* Indicates whether or not the cron job is currently working
* @public
*
* @returns {boolean} - Running or not
Expand Down

0 comments on commit 7f3d921

Please sign in to comment.