Author: pyaschenko
Date: 2010-11-05 08:15:35 -0400 (Fri, 05 Nov 2010)
New Revision: 19949
Modified:
trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/calendar-utils.js
Log:
http://jira.jboss.com/jira/browse/RF-9651
also fixed wrong week number calculation
Modified:
trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/calendar-utils.js
===================================================================
---
trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/calendar-utils.js 2010-11-05
11:57:37 UTC (rev 19948)
+++
trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/calendar-utils.js 2010-11-05
12:15:35 UTC (rev 19949)
@@ -267,10 +267,10 @@
getLastWeekOfPrevYear: function(o) {
var year = o.date.getFullYear()-1;
- var days = (isLeapYear(year) ? 366 : 365);
+ var days = (this.isLeapYear(year) ? 366 : 365);
var obj = this.getFirstWeek(year, o.mdifw, o.fdow);
days = (days - 7 + o.firstDay);
- var weeks = Math.floor(days/7)+1;
+ var weeks = Math.ceil(days/7);
return weeks+obj.weekNumber;
},
@@ -282,7 +282,7 @@
if (month==0)
{
if (o.weekNumber==1) return 1;
- return getLastWeekOfPrevYear(o);
+ return this.getLastWeekOfPrevYear(o);
}
var oneweek = 604800000;
var d = new Date(year, month,1);