From cc641eb2c10348b3b3c2fdacd010914506eb4a0d Mon Sep 17 00:00:00 2001 From: Iskren Chernev Date: Thu, 29 Oct 2015 02:27:33 -0700 Subject: [PATCH] Flip dow,doy arguments of dayOfYearFromWeeks --- src/lib/create/from-array.js | 2 +- src/lib/units/week-calendar-utils.js | 6 +++--- src/lib/units/week-year.js | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/lib/create/from-array.js b/src/lib/create/from-array.js index 308a9db18..fdf7804e2 100644 --- a/src/lib/create/from-array.js +++ b/src/lib/create/from-array.js @@ -127,7 +127,7 @@ function dayOfYearFromWeekInfo(config) { } else if (weekdayOverflow != null) { getParsingFlags(config)._overflowWeekday = true; } else { - temp = dayOfYearFromWeeks(weekYear, week, weekday, doy, dow); + temp = dayOfYearFromWeeks(weekYear, week, weekday, dow, doy); config._a[YEAR] = temp.year; config._dayOfYear = temp.dayOfYear; } diff --git a/src/lib/units/week-calendar-utils.js b/src/lib/units/week-calendar-utils.js index f049558bb..b89810c75 100644 --- a/src/lib/units/week-calendar-utils.js +++ b/src/lib/units/week-calendar-utils.js @@ -13,9 +13,9 @@ function firstWeekOffset(year, dow, doy) { } //http://en.wikipedia.org/wiki/ISO_week_date#Calculating_a_date_given_the_year.2C_week_number_and_weekday -export function dayOfYearFromWeeks(year, week, weekday, firstDayOfWeekOfYear, firstDayOfWeek) { - var localWeekday = (7 + weekday - firstDayOfWeek) % 7, - weekOffset = firstWeekOffset(year, firstDayOfWeek, firstDayOfWeekOfYear), +export function dayOfYearFromWeeks(year, week, weekday, dow, doy) { + var localWeekday = (7 + weekday - dow) % 7, + weekOffset = firstWeekOffset(year, dow, doy), dayOfYear = 1 + 7 * (week - 1) + localWeekday + weekOffset, resYear, resDayOfYear; diff --git a/src/lib/units/week-year.js b/src/lib/units/week-year.js index fe64b17da..44c4f3309 100644 --- a/src/lib/units/week-year.js +++ b/src/lib/units/week-year.js @@ -90,7 +90,7 @@ function getSetWeekYearHelper(input, week, weekday, dow, doy) { } function setWeekAll(weekYear, week, weekday, dow, doy) { - var dayOfYearData = dayOfYearFromWeeks(weekYear, week, weekday, doy, dow), + var dayOfYearData = dayOfYearFromWeeks(weekYear, week, weekday, dow, doy), date = createUTCDate(dayOfYearData.year, 0, dayOfYearData.dayOfYear); // console.log("got", weekYear, week, weekday, "set", date.toISOString()); -- 2.47.2