Author: akushunin
Date: 2007-10-31 11:07:41 -0400 (Wed, 31 Oct 2007)
New Revision: 3638
Modified:
trunk/ui/calendar/src/main/java/org/richfaces/renderkit/CalendarRendererBase.java
trunk/ui/calendar/src/main/templates/org/richfaces/htmlCalendar.jspx
Log:
Calendar refactoring
Modified:
trunk/ui/calendar/src/main/java/org/richfaces/renderkit/CalendarRendererBase.java
===================================================================
---
trunk/ui/calendar/src/main/java/org/richfaces/renderkit/CalendarRendererBase.java 2007-10-31
14:42:30 UTC (rev 3637)
+++
trunk/ui/calendar/src/main/java/org/richfaces/renderkit/CalendarRendererBase.java 2007-10-31
15:07:41 UTC (rev 3638)
@@ -158,7 +158,7 @@
String styleClass = (String) calendar.getAttributes().get("styleClass");
if (styleClass != null && styleClass.length() != 0) {
ResponseWriter writer = context.getResponseWriter();
- writer.writeText("className: " + styleClass + ", ", null);
+ writer.writeText(",\n className: " + styleClass, null);
}
}
@@ -170,7 +170,7 @@
"dayStyleClass");
if (dayStyleClass != null && dayStyleClass.length() != 0) {
ResponseWriter writer = context.getResponseWriter();
- writer.writeText("dayStyleClass: " + dayStyleClass + ", ", null);
+ writer.writeText(",\n dayStyleClass: " + dayStyleClass, null);
}
}
@@ -182,7 +182,7 @@
"isDayEnabled");
if (isDayEnabled != null && isDayEnabled.length() != 0) {
ResponseWriter writer = context.getResponseWriter();
- writer.writeText("isDayEnabled: " + isDayEnabled + ", ", null);
+ writer.writeText(",\n isDayEnabled: " + isDayEnabled, null);
}
}
@@ -197,7 +197,7 @@
UIComponent facet = component.getFacet(facetName);
if (facet != null && facet.isRendered()) {
ResponseWriter writer = context.getResponseWriter();
- writer.writeText(", " + facetName + MARKUP_SUFFIX + ": "
+ writer.writeText(",\n " + facetName + MARKUP_SUFFIX + ": "
+ "[new E('b',{},", null);
writeMarkupScriptBody(context, facet, false);
writer.writeText(")]", null);
@@ -213,7 +213,7 @@
"cellHeight");
ResponseWriter writer = context.getResponseWriter();
String clientId = component.getClientId(context);
- String divStyle="." + clientId + "DayCell{";
+ String divStyle="";
if (cellwidth != null && cellwidth.intValue() > 0){
divStyle = divStyle + "width:"+ cellwidth.toString() + "px;";
}
@@ -222,9 +222,8 @@
divStyle = divStyle +"height:"+ cellheight.toString() + "px;";
}
- if (cellwidth != null && cellwidth.intValue() > 0 || cellheight != null
- && cellheight.intValue() > 0) {
- writer.writeText(divStyle+"}", null);
+ if(divStyle.length()!=0){
+ writer.writeText("." + clientId +
"DayCell{"+divStyle+"}", null);
}
}
@@ -240,13 +239,8 @@
&& cellheight.intValue() > 0) {
String clientId = component.getClientId(context);
- writer.writeText("dayCellClass: '" + clientId +
"DayCell',", null);
+ writer.writeText(",\n dayCellClass: '" + clientId +
"DayCell'", null);
}
-
- if (component.getChildCount() != 0) {
- writer.writeText("dayListMarkup: ", null);
- writeMarkupScriptBody(context, component, true);
- }
}
public void writeFacetMarkupScriptBody(FacesContext context,
@@ -255,7 +249,7 @@
UIComponent facet = component.getFacet(facetName);
if (facet != null && facet.isRendered()) {
ResponseWriter writer = context.getResponseWriter();
- writer.writeText(", " + facetName + MARKUP_SUFFIX + ": ", null);
+ writer.writeText(",\n " + facetName + MARKUP_SUFFIX + ": ",
null);
writeMarkupScriptBody(context, facet, false);
}
}
@@ -345,6 +339,7 @@
ResponseWriter writer = facesContext.getResponseWriter();
Map symbolsMap = getSymbolsMap(facesContext, calendar);
Iterator entryIterator = symbolsMap.entrySet().iterator();
+ writer.writeText(", \n", null);
while (entryIterator.hasNext()) {
Map.Entry entry = (Map.Entry) entryIterator.next();
@@ -353,7 +348,7 @@
writer.writeText(ScriptUtils.toScript(entry.getValue()), null);
if (entryIterator.hasNext()) {
- writer.writeText(", ", null);
+ writer.writeText(", \n", null);
}
}
}
Modified: trunk/ui/calendar/src/main/templates/org/richfaces/htmlCalendar.jspx
===================================================================
--- trunk/ui/calendar/src/main/templates/org/richfaces/htmlCalendar.jspx 2007-10-31
14:42:30 UTC (rev 3637)
+++ trunk/ui/calendar/src/main/templates/org/richfaces/htmlCalendar.jspx 2007-10-31
15:07:41 UTC (rev 3638)
@@ -150,15 +150,18 @@
verticalOffset:#{component.verticalOffset},
horizontalOffset: #{component.horizontalOffset},
style:'z-index: #{component.attributes["zindex"]};
#{component.attributes["style"]}',
+ firstWeekDay: #{this:getFirstWeekDay(context, component)},
+ minDaysInFirstWeek: #{this:getMinDaysInFirstWeek(context, component)}
+
+
<f:call name="writeClass"/>
<f:call name="writeDayCellClass"/>
<f:call name="writeDayStyleClass"/>
<f:call name="writeIsDayEnabled"/>
- <f:call name="writeSymbols" />,
- firstWeekDay: #{this:getFirstWeekDay(context, component)},
- minDaysInFirstWeek: #{this:getMinDaysInFirstWeek(context, component)}
+ <f:call name="writeSymbols" />
+
<f:call name="writeEventHandlerFunction"><f:parameter
value="ondateselected" /></f:call>
<f:call name="writeEventHandlerFunction"><f:parameter
value="ondateselect" /></f:call>
<f:call name="writeEventHandlerFunction"><f:parameter
value="ondatemouseover" /></f:call>
@@ -167,6 +170,14 @@
<f:call name="writeEventHandlerFunction"><f:parameter
value="oncollapse" /></f:call>
<f:call name="writeEventHandlerFunction"><f:parameter
value="oncurrentdateselect" /></f:call>
+ <jsp:scriptlet>/*<![CDATA[*/
+ if (component.getChildCount() != 0) {
+ /*]]>*/</jsp:scriptlet>
+ ,\n dayListMarkup:
+ <jsp:scriptlet>/*<![CDATA[*/
+ writeMarkupScriptBody(context, component, true);
+ }
+ /*]]>*/</jsp:scriptlet>
<f:call name="writeOptionalFacetMarkupScriptBody"><f:parameter
value="optionalHeader" /></f:call>
<f:call name="writeOptionalFacetMarkupScriptBody"><f:parameter
value="optionalFooter" /></f:call>