Author: pyaschenko Date: 2007-09-19 11:04:36 -0400 (Wed, 19 Sep 2007) New Revision: 3001 Modified: trunk/ui/calendar/src/main/resources/org/richfaces/renderkit/html/scripts/calendar.js Log: RF-913 Modified: trunk/ui/calendar/src/main/resources/org/richfaces/renderkit/html/scripts/calendar.js =================================================================== --- trunk/ui/calendar/src/main/resources/org/richfaces/renderkit/html/scripts/calendar.js 2007-09-19 13:33:19 UTC (rev 3000) +++ trunk/ui/calendar/src/main/resources/org/richfaces/renderkit/html/scripts/calendar.js 2007-09-19 15:04:36 UTC (rev 3001) @@ -381,6 +381,7 @@ // dayListMarkup - day cell markup // weekNumberMarkup - week number cell markup // weekDayMarkup - week day cell markup + // context: {weekDayLabel, weekDayLabelShort, weekDayNumber, componentId} // headerMarkup // footerMarkup // headerOptionalMarkup - user defined header (optional) @@ -389,6 +390,7 @@ // currentDate - date to show month (day not used) (mm/yyyy) // selectedDate - selected date (mm/dd/yyyy) // weekDayLabels - collection of week day labels keyed by week day numbers + // weekDayLabelsShort - collection of week day short labels keyed by week day numbers // minDaysInFirstWeek - locale-specific constant defining number of days in the first week // firstWeekDay - (0..6) locale-specific constant defining number of the first week day // showWeekDaysBar - show WeekDays Bar [default value is true] @@ -410,7 +412,7 @@ this.params = parameters; if (!this.params.showWeekDaysBar) this.params.showWeekDaysBar = true; if (!this.params.showWeeksBar) this.params.showWeeksBar = true; - if (!this.params.datePattern) this.params.datePattern = "MMM d, y"; + if (!this.params.datePattern) thisparams.datePattern = "MMM d, y"; // markups initialization if (!this.params.dayListMarkup) this.params.dayListMarkup = CalendarView.dayList; @@ -491,7 +493,7 @@ var weekDayCounter = this.params.firstWeekDay; for (var i=0;i<7;i++) { - var weekDayHtml = this.evaluateMarkup(this.params.weekDayMarkup, {weekDayLabel: this.params.weekDayLabelsShort[weekDayCounter], weekDayNumber:weekDayCounter, componentId:this.getWeekDayComponentId(i)} ); + var weekDayHtml = this.evaluateMarkup(this.params.weekDayMarkup, {weekDayLabel: this.params.weekDayLabels[weekDayCounter], weekDayLabelShort: this.params.weekDayLabelsShort[weekDayCounter], weekDayNumber:weekDayCounter, componentId:this.getWeekDayComponentId(i)} ); if (weekDayCounter==6) weekDayCounter=0; else weekDayCounter++; styleClass = "rich-calendar-days"; @@ -1392,7 +1394,7 @@ CalendarView.dayList = [new ET(function (context) { return context.day})]; CalendarView.weekNumber = [new ET(function (context) { return context.weekNumber})]; -CalendarView.weekDay = [new ET(function (context) { return context.weekDayLabel})]; +CalendarView.weekDay = [new ET(function (context) { return context.weekDayLabelShort})]; CalendarContext = Class.create(); Object.extend(CalendarContext.prototype, { @@ -1400,6 +1402,8 @@ this.calendar=calendar; this.monthLabels=calendar.params.monthLabels; this.monthLabelsShort=calendar.params.monthLabelsShort; + this.weekDayLabels=calendar.params.weekDayLabels; + this.weekDayLabelsShort=calendar.params.weekDayLabelsShort; }, nextYearControl: CalendarView.nextYearControl,