8:18 p.m.
Author: amarkhel
Date: 2010-10-27 14:18:59 -0400 (Wed, 27 Oct 2010)
New Revision: 19713
Modified:
sandbox/trunk/ui/calendar/ui/src/main/java/org/richfaces/component/AbstractCalendar.java
sandbox/trunk/ui/calendar/ui/src/main/java/org/richfaces/renderkit/CalendarRendererBase.java
sandbox/trunk/ui/calendar/ui/src/main/resources/META-INF/resources/org.richfaces/calendar-utils.js
sandbox/trunk/ui/calendar/ui/src/main/resources/META-INF/resources/org.richfaces/calendar.ecss
sandbox/trunk/ui/calendar/ui/src/main/resources/META-INF/resources/org.richfaces/calendar.js
sandbox/trunk/ui/calendar/ui/src/main/templates/calendar.template.xml
Log:
fix template, fix properties passing to javascript, client calendar js simple fixes
Modified:
sandbox/trunk/ui/calendar/ui/src/main/java/org/richfaces/component/AbstractCalendar.java
===================================================================
---
sandbox/trunk/ui/calendar/ui/src/main/java/org/richfaces/component/AbstractCalendar.java 2010-10-27
18:15:07 UTC (rev 19712)
+++
sandbox/trunk/ui/calendar/ui/src/main/java/org/richfaces/component/AbstractCalendar.java 2010-10-27
18:18:59 UTC (rev 19713)
@@ -69,10 +69,10 @@
public static final String TIME_PATTERN = "HH:mm";
- public static final String DEFAULT_DATE_PATTERN = "MMM d, YYYY";
+ public static final String DEFAULT_DATE_PATTERN = "MMM d, yyyy";
- @Attribute(defaultValue="MMM d, YYYY")
+ @Attribute(defaultValue="MMM d, yyyy")
public abstract String getDatePattern();
@Attribute(defaultValue="getDefaultLocale()")
Modified:
sandbox/trunk/ui/calendar/ui/src/main/java/org/richfaces/renderkit/CalendarRendererBase.java
===================================================================
---
sandbox/trunk/ui/calendar/ui/src/main/java/org/richfaces/renderkit/CalendarRendererBase.java 2010-10-27
18:15:07 UTC (rev 19712)
+++
sandbox/trunk/ui/calendar/ui/src/main/java/org/richfaces/renderkit/CalendarRendererBase.java 2010-10-27
18:18:59 UTC (rev 19713)
@@ -24,6 +24,8 @@
import java.io.IOException;
import java.text.DateFormatSymbols;
+import java.text.Format;
+import java.text.SimpleDateFormat;
import java.util.Calendar;
import java.util.Collections;
import java.util.Date;
@@ -123,6 +125,10 @@
public static final String OPTION_DEFAULT_TIME = "defaultTime";
+ public static final String OPTION_HIDE_POPUP_ON_SCROLL =
"hidePopupOnScroll";
+
+ public static final String OPTION_SHOW_WEEK_DAYS_BAR = "showWeekDaysBar";
+
public static final String MONTH_LABELS_SHORT = "monthLabelsShort";
public static final String MONTH_LABELS = "monthLabels";
@@ -134,6 +140,8 @@
public static final String FIRST_DAY_WEEK = "firstWeekDay";
public static final String MIN_DAYS_IN_FIRST_WEEK = "minDaysInFirstWeek";
+
+
protected static final Map<String, ComponentAttribute>
CALENDAR_INPUT_HANDLER_ATTRIBUTES =
Collections.unmodifiableMap(ComponentAttribute.createMap(
@@ -260,6 +268,13 @@
return formatDate(date);
}
+ public String getCurrentDateAsString(FacesContext context, AbstractCalendar calendar)
throws IOException {
+ Format formatter = new SimpleDateFormat("MM/yyyy");
+
+ Date currentDate = calendar.getCurrentDateOrDefault();
+ return formatter.format(currentDate);
+ }
+
public static Object formatDate(Date date) {
Calendar calendar = Calendar.getInstance();
calendar.setTime(date);
@@ -481,38 +496,38 @@
ScriptOptions scriptOptions = new ScriptOptions(component);
scriptOptions.addOption(OPTION_ENABLE_MANUAL_INPUT);
- scriptOptions.addOption("disabled");
- scriptOptions.addOption("readonly");
- scriptOptions.addOption("resetTimeOnDateSelect");
- scriptOptions.addOption("showApplyButton");
- scriptOptions.addOption("styleClass");
- scriptOptions.addOption("popup");
- scriptOptions.addOption("showInput");
- scriptOptions.addOption("showHeader");
- scriptOptions.addOption("showFooter");
- scriptOptions.addOption("showWeeksBar");
- scriptOptions.addOption("showWeekDaysBar");
- scriptOptions.addOption("todayControlMode");
- scriptOptions.addOption("datePattern");
- scriptOptions.addOption("jointPoint");
- scriptOptions.addOption("direction");
- scriptOptions.addOption("boundaryDatesMode");
- scriptOptions.addOption("horizontalOffset");
- scriptOptions.addOption("verticalOffset");
- scriptOptions.addOption("hidePopupOnScroll");
-
- scriptOptions.addOption("currentDate", getCurrentDate(facesContext,
calendar));
- scriptOptions.addOption("selectedDate", getSelectedDate(facesContext,
calendar));
- scriptOptions.addOption("style", HtmlUtil.concatStyles("z-index:
" + calendar.getZindex(), calendar.getStyle()));
- scriptOptions.addOption("submitFunction",
getSubmitFunction(facesContext, calendar));
- scriptOptions.addOption("dayCellClass", getDayCellClass(facesContext,
calendar));
- scriptOptions.addOption("dayStyleClass", getDayStyleClass(facesContext,
calendar));
+ scriptOptions.addOption(OPTION_DISABLED);
+ scriptOptions.addOption(OPTION_READONLY);
+ scriptOptions.addOption(OPTION_RESET_TIME_ON_DATE_SELECT);
+ scriptOptions.addOption(OPTION_SHOW_APPLY_BUTTON);
+ scriptOptions.addOption(OPTION_POPUP);
+ scriptOptions.addOption(OPTION_SHOW_INPUT);
+ scriptOptions.addOption(OPTION_SHOW_HEADER);
+ scriptOptions.addOption(OPTION_SHOW_FOOTER);
+ scriptOptions.addOption(OPTION_SHOW_WEEKS_BAR);
+ scriptOptions.addOption(OPTION_TODAY_CONTROL_MODE);
+ scriptOptions.addOption(OPTION_DATE_PATTERN);
+ scriptOptions.addOption(OPTION_JOINT_POINT);
+ scriptOptions.addOption(OPTION_DIRECTION);
+ scriptOptions.addOption(OPTION_BOUNDARY_DATES_MODE);
+ scriptOptions.addOption(OPTION_HORIZONTAL_OFFSET);
+ scriptOptions.addOption(OPTION_VERTICAL_OFFSET);
+ scriptOptions.addOption(OPTION_CURRENT_DATE, getCurrentDate(facesContext,
calendar));
+ scriptOptions.addOption(OPTION_SELECTED_DATE, getSelectedDate(facesContext,
calendar));
+ scriptOptions.addOption(OPTION_SUBMIT_FUNCTION, getSubmitFunction(facesContext,
calendar));
+ scriptOptions.addOption(OPTION_DAY_CELL_CLASS, getDayCellClass(facesContext,
calendar));
+ scriptOptions.addOption(OPTION_DAY_STYLE_CLASS, getDayStyleClass(facesContext,
calendar));
/*
*add to script option
*<cdk:scriptOption attributes="ondateselected, ondateselect,
ontimeselect, ontimeselected, onchanged, ondatemouseover, ondatemouseout, onexpand,
oncollapse, oncurrentdateselect, oncurrentdateselected"
wrapper="eventHandler" />
* */
- scriptOptions.addOption("labels", getLabels(facesContext, calendar));
- scriptOptions.addOption("defaultTime",
getPreparedDefaultTime(calendar));
+ scriptOptions.addOption(OPTION_LABELS, getLabels(facesContext, calendar));
+ scriptOptions.addOption(OPTION_DEFAULT_TIME, getPreparedDefaultTime(calendar));
+ scriptOptions.addOption(OPTION_HIDE_POPUP_ON_SCROLL);
+ scriptOptions.addOption("showWeekDaysBar");
+
+ scriptOptions.addOption("styleClass");
+ scriptOptions.addOption("style", HtmlUtil.concatStyles("z-index:
" + calendar.getZindex(), calendar.getStyle()));
return scriptOptions;
}
Modified:
sandbox/trunk/ui/calendar/ui/src/main/resources/META-INF/resources/org.richfaces/calendar-utils.js
===================================================================
---
sandbox/trunk/ui/calendar/ui/src/main/resources/META-INF/resources/org.richfaces/calendar-utils.js 2010-10-27
18:15:07 UTC (rev 19712)
+++
sandbox/trunk/ui/calendar/ui/src/main/resources/META-INF/resources/org.richfaces/calendar-utils.js 2010-10-27
18:18:59 UTC (rev 19713)
@@ -161,7 +161,7 @@
yy += Math.floor(defaultCenturyStartYear/100)*100 + (yy < ambiguousTwoDigitYear ?
100 : 0);
}
- var mm = parseInt(match[m],10); if (isNaN(mm)) mm =
Richfaces.Calendar.getMonthByLabel(match[m], shortLabel ? monthNamesShort : monthNames);
else if (--mm<0 || mm>11) return null;
+ var mm = parseInt(match[m],10); if (isNaN(mm)) mm = this.getMonthByLabel(match[m],
shortLabel ? monthNamesShort : monthNames); else if (--mm<0 || mm>11) return null;
var addDay = correctYear ? 1 : 0;
var dd = parseInt(match[d],10); if (isNaN(dd) || dd<1 ||
dd>this.daysInMonth(yy, mm) + addDay) return null;
Modified:
sandbox/trunk/ui/calendar/ui/src/main/resources/META-INF/resources/org.richfaces/calendar.ecss
===================================================================
---
sandbox/trunk/ui/calendar/ui/src/main/resources/META-INF/resources/org.richfaces/calendar.ecss 2010-10-27
18:15:07 UTC (rev 19712)
+++
sandbox/trunk/ui/calendar/ui/src/main/resources/META-INF/resources/org.richfaces/calendar.ecss 2010-10-27
18:18:59 UTC (rev 19713)
@@ -354,9 +354,9 @@
.rich-calendar-editor-layout-shadow {
background-color: '#{richSkin.shadowBackgroundColor}';
+ position: absolute;
opacity: 0.3;
filter: alpha(opacity=30);
- position: absolute;
}
.rich-calendar-editor-btn {
Modified:
sandbox/trunk/ui/calendar/ui/src/main/resources/META-INF/resources/org.richfaces/calendar.js
===================================================================
---
sandbox/trunk/ui/calendar/ui/src/main/resources/META-INF/resources/org.richfaces/calendar.js 2010-10-27
18:15:07 UTC (rev 19712)
+++
sandbox/trunk/ui/calendar/ui/src/main/resources/META-INF/resources/org.richfaces/calendar.js 2010-10-27
18:18:59 UTC (rev 19713)
@@ -281,7 +281,7 @@
// optionalHeaderMarkup - user defined header (optional)
// optionalFooterMarkup - user defined footer (optional)
- // currentDate - date to show month (day not used) (mm/yyyy)
+ // 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
Modified: sandbox/trunk/ui/calendar/ui/src/main/templates/calendar.template.xml
===================================================================
--- sandbox/trunk/ui/calendar/ui/src/main/templates/calendar.template.xml 2010-10-27
18:15:07 UTC (rev 19712)
+++ sandbox/trunk/ui/calendar/ui/src/main/templates/calendar.template.xml 2010-10-27
18:18:59 UTC (rev 19713)
@@ -59,7 +59,7 @@
</c:choose>
</c:otherwise>
</c:choose>
- <input type="hidden" id="#{clientId}InputCurrentDate"
style="display:none" autocomplete="off"
name="#{clientId}InputCurrentDate"
value="#{component.attributes['currentDate']}" />
+ <input type="hidden" id="#{clientId}InputCurrentDate"
style="display:none" autocomplete="off"
name="#{clientId}InputCurrentDate"
value="getCurrentDateAsString(facesContext, component)" />
</span>
<div style="display: none;" id="#{clientId}"></div>