Skip to content

Commit

Permalink
Merge branch 'master' into dependabot/npm_and_yarn/lodash-4.17.19
Browse files Browse the repository at this point in the history
  • Loading branch information
Hypnos3 authored Dec 8, 2020
2 parents c3fa837 + 11d01cc commit 8d4e28b
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 10 deletions.
16 changes: 8 additions & 8 deletions german-holidays.html
Original file line number Diff line number Diff line change
Expand Up @@ -940,7 +940,7 @@ <h3>References</h3>
const L = I - J;
const M = 3 + Math.floor((L + 40) / 44);
const D = L + 28 - 31 * Math.floor(M / 4);
return new Date(Date.UTC(year, M - 1, D));
return new Date(year, M - 1, D);
}

/**
Expand Down Expand Up @@ -998,7 +998,7 @@ <h3>References</h3>
function _makeDate(year, naturalMonthOrRef, day) {
console.log(`_makeDate year=${year} naturalMonthOrRef=${naturalMonthOrRef} day=${day} `); // eslint-disable-line
if (typeof year === 'object') {
year = year.getUTCFullYear();
year = year.getFullYear();
}

if (typeof naturalMonthOrRef === 'object' && !isNaN(day)) {
Expand All @@ -1018,7 +1018,7 @@ <h3>References</h3>
}

if (naturalMonthOrRef <= 12 && day >= 1 && day <= 31) {
return new Date(Date.UTC(year, naturalMonthOrRef - 1, day));
return new Date(year, naturalMonthOrRef - 1, day);
}
return null;
}
Expand Down Expand Up @@ -1274,7 +1274,7 @@ <h3>References</h3>
// #endregion migrate

// #region dialog
const year = (new Date()).getUTCFullYear();
const year = (new Date()).getFullYear();
const easter_date = _getEasterDate(year);
const advent4th_date = _getAdvent4th(year);

Expand Down Expand Up @@ -1342,8 +1342,8 @@ <h3>References</h3>
if (month >= 1 && month <= 12) {
$dialogDateType.val('date');
const date = new Date();
date.setUTCHours(0,0,0,0);
date.setUTCMonth(month - 1,day);
date.setHours(0,0,0,0);
date.setMonth(month - 1,day);
$dialogDate.datepicker('setDate', date);
} else if (month >= 13 && month <= 24) {
$dialogDateType.val('weekdayfirst');
Expand Down Expand Up @@ -1411,8 +1411,8 @@ <h3>References</h3>
default: {
const date = $dialogDate.datepicker( 'getDate' );
if (date !== null) {
$dialogConnFields.find('.node-input-item-month').val(String(date.getUTCMonth() + 1));
$dialogConnFields.find('.node-input-item-day').val(date.getUTCDate());
$dialogConnFields.find('.node-input-item-month').val(String(date.getMonth() + 1));
$dialogConnFields.find('.node-input-item-day').val(date.getDate());
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "node-red-contrib-german-holidays",
"version": "1.0.2-beta",
"version": "1.0.2-beta2",
"description": "NodeRED nodes to get holidays or special days (not even german holidays)",
"keywords": [
"node-red",
Expand Down

0 comments on commit 8d4e28b

Please sign in to comment.