[richfaces-svn-commits] JBoss Rich Faces SVN: r22182 - in branches/4.0.X/ui/input/ui/src: main/java/org/richfaces/renderkit and 2 other directories.

Author: pyaschenko Date: 2011-03-12 09:03:44 -0500 (Sat, 12 Mar 2011) New Revision: 22182 Modified: branches/4.0.X/ui/input/ui/src/main/java/org/richfaces/component/AbstractCalendar.java branches/4.0.X/ui/input/ui/src/main/java/org/richfaces/renderkit/CalendarRendererBase.java branches/4.0.X/ui/input/ui/src/main/templates/calendar.template.xml branches/4.0.X/ui/input/ui/src/test/resources/org/richfaces/component/calendarContent.xmlunit.xml branches/4.0.X/ui/input/ui/src/test/resources/org/richfaces/component/calendarTest.xhtml Log: https://jira.jboss.org/browse/RF-9655 Reviewed by Gleb Galkin Modified: branches/4.0.X/ui/input/ui/src/main/java/org/richfaces/component/AbstractCalendar.java =================================================================== --- branches/4.0.X/ui/input/ui/src/main/java/org/richfaces/component/AbstractCalendar.java 2011-03-12 13:17:17 UTC (rev 22181) +++ branches/4.0.X/ui/input/ui/src/main/java/org/richfaces/component/AbstractCalendar.java 2011-03-12 14:03:44 UTC (rev 22182) @@ -171,8 +171,14 @@ @Attribute public abstract String getStyleClass(); + + @Attribute + public abstract String getPopupStyle(); @Attribute + public abstract String getPopupClass(); + + @Attribute public abstract Object getMonthLabels(); @Attribute Modified: branches/4.0.X/ui/input/ui/src/main/java/org/richfaces/renderkit/CalendarRendererBase.java =================================================================== --- branches/4.0.X/ui/input/ui/src/main/java/org/richfaces/renderkit/CalendarRendererBase.java 2011-03-12 13:17:17 UTC (rev 22181) +++ branches/4.0.X/ui/input/ui/src/main/java/org/richfaces/renderkit/CalendarRendererBase.java 2011-03-12 14:03:44 UTC (rev 22182) @@ -516,14 +516,14 @@ return true; } - public String getStyleWithZindex(FacesContext facesContext, UIComponent component) { + public String getPopupStyle(FacesContext facesContext, UIComponent component) { AbstractCalendar calendar = (AbstractCalendar) component; int zindex = calendar.getZindex(); if (zindex < 0) { zindex = 3; } - return HtmlUtil.concatStyles("z-index: " + zindex, calendar.getStyle()); + return HtmlUtil.concatStyles("z-index: " + zindex, calendar.getPopupStyle()); } public Locale getAsLocale(FacesContext facesContext, UIComponent component) { Modified: branches/4.0.X/ui/input/ui/src/main/templates/calendar.template.xml =================================================================== --- branches/4.0.X/ui/input/ui/src/main/templates/calendar.template.xml 2011-03-12 13:17:17 UTC (rev 22181) +++ branches/4.0.X/ui/input/ui/src/main/templates/calendar.template.xml 2011-03-12 14:03:44 UTC (rev 22182) @@ -23,7 +23,7 @@ <cdk:import package="org.richfaces.component" names="Positioning" /> </cc:interface> <cc:implementation> - <span id="#{clientId}" class="#{component.attributes['styleClass']}"> + <span id="#{clientId}" class="#{component.attributes['styleClass']}" style="#{component.attributes['style']}"> <span id="#{clientId}Popup" style="#{component.attributes['popup'] ? 'white-space: nowrap;' : 'display: none;'}"> <c:choose> @@ -70,7 +70,7 @@ <script type="text/javascript"> <cdk:scriptObject name="options"> - <cdk:scriptOption attributes="enableManualInput disabled readonly resetTimeOnDateSelect showApplyButton popup showInput showHeader showFooter showWeeksBar datePattern hidePopupOnScrol showWeekDaysBar styleClass defaultLabel" /> + <cdk:scriptOption attributes="enableManualInput disabled readonly resetTimeOnDateSelect showApplyButton popup showInput showHeader showFooter showWeeksBar datePattern hidePopupOnScrol showWeekDaysBar defaultLabel" /> <cdk:scriptOption attributes="onchange ondateselect onbeforedateselect onbeforecurrentdateselect onhide onshow ondatemouseover ondatemouseout onclean ontimeselect onbeforetimeselect" wrapper="eventHandler" /> <cdk:scriptOption name="mode" value="#{getModeOrDefault(component)}" defaultValue="org.richfaces.component.AbstractCalendar.Mode.client"/> <cdk:scriptOption name="todayControlMode" value="#{getTodayControlModeOrDefault(component)}" defaultValue='"select"'/> @@ -86,7 +86,8 @@ <cdk:scriptOption name="isDayEnabled" value="#{getDayEnabled(facesContext, component)}" /> <cdk:scriptOption name="labels" value="#{getLabels(facesContext, component)}" /> <cdk:scriptOption name="defaultTime" value="#{getPreparedDefaultTime(facesContext, component)}" /> - <cdk:scriptOption name="style" value="#{getStyleWithZindex(facesContext, component)}" /> + <cdk:scriptOption name="style" value="#{getPopupStyle(facesContext, component)}" /> + <cdk:scriptOption name="styleClass" value="#{component.attributes['popupClass']}" /> </cdk:scriptObject> RichFaces.ui.Calendar.addLocale("#{getAsLocale(facesContext, component).toString()}", Modified: branches/4.0.X/ui/input/ui/src/test/resources/org/richfaces/component/calendarContent.xmlunit.xml =================================================================== --- branches/4.0.X/ui/input/ui/src/test/resources/org/richfaces/component/calendarContent.xmlunit.xml 2011-03-12 13:17:17 UTC (rev 22181) +++ branches/4.0.X/ui/input/ui/src/test/resources/org/richfaces/component/calendarContent.xmlunit.xml 2011-03-12 14:03:44 UTC (rev 22182) @@ -1,4 +1,4 @@ -<table id="form:calendarContent" border="0" cellpadding="0" cellspacing="0" class="rf-cal-extr rf-cal-popup undefined" style="display:none; position:absolute;z-index: 3;width:200px" onclick="RichFaces.$(&apos;form:calendar&apos;).skipEventOnCollapse=true;"> +<table id="form:calendarContent" border="0" cellpadding="0" cellspacing="0" class="rf-cal-extr rf-cal-popup undefined" style="display:none; position:absolute;z-index: 3" onclick="RichFaces.$(&apos;form:calendar&apos;).skipEventOnCollapse=true;"> <tbody> <tr> <td class="rf-cal-hdr" colspan="8" id="form:calendarHeader"/> Modified: branches/4.0.X/ui/input/ui/src/test/resources/org/richfaces/component/calendarTest.xhtml =================================================================== --- branches/4.0.X/ui/input/ui/src/test/resources/org/richfaces/component/calendarTest.xhtml 2011-03-12 13:17:17 UTC (rev 22181) +++ branches/4.0.X/ui/input/ui/src/test/resources/org/richfaces/component/calendarTest.xhtml 2011-03-12 14:03:44 UTC (rev 22182) @@ -20,7 +20,7 @@ showHeader="true" currentDate="#{calendarBean.selectedDate}" showApplyButton="#{calendarBean.showApply}" cellWidth="24px" - cellHeight="22px" style="width:200px"> + cellHeight="22px"> <f:convertDateTime pattern="#{calendarBean.pattern}" onchange="alert('1')" /> </in:calendar>