Author: ppitonak(a)redhat.com Date: 2010-12-08 10:58:09 -0500 (Wed, 08 Dec 2010) New Revision: 20465 Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichCalendarBean.java modules/tests/metamer/trunk/application/src/main/resources/org/richfaces/tests/metamer/bean/RichCalendarBean.properties modules/tests/metamer/trunk/application/src/main/webapp/components/richCalendar/simple.xhtml Log: * added new attributes to calendar Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichCalendarBean.java =================================================================== --- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichCalendarBean.java 2010-12-08 15:42:52 UTC (rev 20464) +++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichCalendarBean.java 2010-12-08 15:58:09 UTC (rev 20465) @@ -72,6 +72,7 @@ // TODO has to be tested in another way attributes.remove("converter"); + attributes.remove("dataModel"); attributes.remove("validator"); attributes.remove("valueChangeListener"); } Modified: modules/tests/metamer/trunk/application/src/main/resources/org/richfaces/tests/metamer/bean/RichCalendarBean.properties =================================================================== --- modules/tests/metamer/trunk/application/src/main/resources/org/richfaces/tests/metamer/bean/RichCalendarBean.properties 2010-12-08 15:42:52 UTC (rev 20464) +++ modules/tests/metamer/trunk/application/src/main/resources/org/richfaces/tests/metamer/bean/RichCalendarBean.properties 2010-12-08 15:58:09 UTC (rev 20465) @@ -11,10 +11,14 @@ attr.buttonIconDisabled.heart=/resources/images/heart.png attr.buttonIconDisabled.null= -attr.dayStyleClass.yellowTuesdays=yellowTuesdays -attr.dayStyleClass.aquaWeekends=aquaWeekends -attr.dayStyleClass.null= +attr.dayClassFunction.yellowTuesdays=yellowTuesdays +attr.dayClassFunction.aquaWeekends=aquaWeekends +attr.dayClassFunction.null= +attr.dayDisableFunction.disableTuesdays=disableTuesdays +attr.dayDisableFunction.disableWeekends=disableWeekends +attr.dayDisableFunction.null= + attr.direction.top-left=top-left attr.direction.top-right=top-right attr.direction.bottom-left=bottom-left Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richCalendar/simple.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/richCalendar/simple.xhtml 2010-12-08 15:42:52 UTC (rev 20464) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richCalendar/simple.xhtml 2010-12-08 15:58:09 UTC (rev 20465) @@ -60,6 +60,20 @@ return false; } + function disableTuesdays(day) { + if (day.date.getDay() == 2) { + return false; + } + return true; + } + + function disableWeekends(day) { + if (day.isWeekend) { + return false; + } + return true; + } + testedComponentId = "#{rich:clientId('calendar')}"; </script> </ui:define> @@ -79,8 +93,8 @@ converterMessage="#{richCalendarBean.attributes['converterMessage'].value}" currentDate="#{richCalendarBean.attributes['currentDate'].value}" datePattern="#{richCalendarBean.attributes['datePattern'].value}" - dayEnabled="#{richCalendarBean.attributes['dayEnabled'].value}" - dayStyleClass="#{richCalendarBean.attributes['dayStyleClass'].value}" + dayClassFunction="#{richCalendarBean.attributes['dayClassFunction'].value}" + dayDisableFunction="#{richCalendarBean.attributes['dayDisableFunction'].value}" defaultTime="#{richCalendarBean.attributes['defaultTime'].value}" direction="#{richCalendarBean.attributes['direction'].value}" disabled="#{richCalendarBean.attributes['disabled'].value}" @@ -95,6 +109,18 @@ jointPoint="#{richCalendarBean.attributes['jointPoint'].value}" locale="#{richCalendarBean.attributes['locale'].value}" minDaysInFirstWeek="#{richCalendarBean.attributes['minDaysInFirstWeek'].value}" + mode="#{richCalendarBean.attributes['mode'].value}" + onbeforecurrentdateselect="#{richCalendarBean.attributes['onbeforecurrentdateselect'].value}" + onbeforedateselect="#{richCalendarBean.attributes['onbeforedateselect'].value}" + onbeforetimeselect="#{richCalendarBean.attributes['onbeforetimeselect'].value}" + onchange="#{richCalendarBean.attributes['onchange'].value}" + onclean="#{richCalendarBean.attributes['onclean'].value}" + oncollapse="#{richCalendarBean.attributes['oncollapse'].value}" + oncomplete="#{richCalendarBean.attributes['oncomplete'].value}" + oncurrentdateselect="#{richCalendarBean.attributes['oncurrentdateselect'].value}" + ondatemouseout="#{richCalendarBean.attributes['ondatemouseout'].value}" + ondatemouseover="#{richCalendarBean.attributes['ondatemouseover'].value}" + ondateselect="#{richCalendarBean.attributes['ondateselect'].value}" oninputblur="#{richCalendarBean.attributes['oninputblur'].value}" oninputchange="#{richCalendarBean.attributes['oninputchange'].value}" oninputclick="#{richCalendarBean.attributes['oninputclick'].value}" @@ -109,7 +135,11 @@ oninputmouseover="#{richCalendarBean.attributes['oninputmouseover'].value}" oninputmouseup="#{richCalendarBean.attributes['oninputmouseup'].value}" oninputselect="#{richCalendarBean.attributes['oninputselect'].value}" + onshow="#{richCalendarBean.attributes['onshow'].value}" + ontimeselect="#{richCalendarBean.attributes['ontimeselect'].value}" popup="#{richCalendarBean.attributes['popup'].value}" + preloadDateRangeBegin="#{richCalendarBean.attributes['preloadDateRangeBegin'].value}" + preloadDateRangeEnd="#{richCalendarBean.attributes['preloadDateRangeEnd'].value}" rendered="#{richCalendarBean.attributes['rendered'].value}" required="#{richCalendarBean.attributes['required'].value}" requiredMessage="#{richCalendarBean.attributes['requiredMessage'].value}" @@ -126,10 +156,11 @@ todayControlMode="#{richCalendarBean.attributes['todayControlMode'].value}" validatorMessage="#{richCalendarBean.attributes['validatorMessage'].value}" value="#{richCalendarBean.attributes['value'].value}" + valueChangeListener="#{richBean.valueChangeListener}" verticalOffset="#{richCalendarBean.attributes['verticalOffset'].value}" zindex="#{richCalendarBean.attributes['zindex'].value}" - <a4j:ajax event="inputchange" render="output"/> + <a4j:ajax event="change" render="output, requestTime" limitRender="#{true}"/> </rich:calendar> </div>