From 6f24c1e7683f982d20928d5fe43e3d89097739cd Mon Sep 17 00:00:00 2001 From: Isaac Cambron Date: Sat, 5 Oct 2013 15:52:07 -0400 Subject: [PATCH] making things clearer --- moment.js | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/moment.js b/moment.js index 952179450..1d59611e1 100644 --- a/moment.js +++ b/moment.js @@ -1098,14 +1098,19 @@ w = config._w; if (w.GG != null || w.W != null || w.E != null) { - temp = dayOfYearFromWeeks(fixYear(w.GG), w.W, w.E, 4, 1); + temp = dayOfYearFromWeeks(fixYear(w.GG), w.W || 1, w.E, 4, 1); } else { lang = getLangDefinition(config._l); - weekday = w.d != null ? parseWeekday(w.d, lang) : (w.e != null ? parseInt(w.e, 10) + lang._week.dow : 0); + weekday = w.d != null ? parseWeekday(w.d, lang) : + (w.e != null ? parseInt(w.e, 10) + lang._week.dow : 0); + + week = parseInt(w.w, 10) || 1; //if we're parsing 'd', then the low day numbers may be next week - week = w.w != null ? (w.d != null && weekday < lang._week.dow ? parseInt(w.w, 10) + 1 : w.w) : w.w; + if (w.d != null && weekday < lang._week.dow) { + week++; + } temp = dayOfYearFromWeeks(fixYear(w.gg), week, weekday, lang._week.doy, lang._week.dow); } @@ -1448,7 +1453,6 @@ var d = new Date(Date.UTC(year, 0)).getUTCDay(), daysToAdd, dayOfYear; - week = week || 1; weekday = weekday != null ? weekday : firstDayOfWeek; daysToAdd = firstDayOfWeek - d + (d > firstDayOfWeekOfYear ? 7 : 0); dayOfYear = 7 * (week - 1) + (weekday - firstDayOfWeek) + daysToAdd + 1; -- 2.47.2