You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by mm...@apache.org on 2005/12/21 11:02:10 UTC
svn commit: r358250 -
/myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/calendar/HtmlCalendarRenderer.java
Author: mmarinschek
Date: Wed Dec 21 02:02:03 2005
New Revision: 358250
URL: http://svn.apache.org/viewcvs?rev=358250&view=rev
Log:
still puzzled by the IE bug using calendar.
Modified:
myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/calendar/HtmlCalendarRenderer.java
Modified: myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/calendar/HtmlCalendarRenderer.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/calendar/HtmlCalendarRenderer.java?rev=358250&r1=358249&r2=358250&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/calendar/HtmlCalendarRenderer.java (original)
+++ myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/calendar/HtmlCalendarRenderer.java Wed Dec 21 02:02:03 2005
@@ -167,12 +167,12 @@
String calendarVar = JavascriptUtils.getValidJavascriptName(
inputCalendar.getClientId(facesContext)+"CalendarVar",false);
- writer.writeText("var "+calendarVar+"=new org_apache_myfaces_PopupCalendar();",null);
+ writer.writeText("alert('1'); var "+calendarVar+"=new org_apache_myfaces_PopupCalendar();\n",null);
writer.writeText(getLocalizedLanguageScript(facesContext,symbols, months,
- timeKeeper.getFirstDayOfWeek(),inputCalendar,calendarVar),null);
- writer.writeText(calendarVar+".init();",null);
+ timeKeeper.getFirstDayOfWeek(),inputCalendar,calendarVar)+"\n",null);
+ writer.writeText(calendarVar+".init();\n",null);
writer.writeText(getScriptBtn(facesContext, inputCalendar,
- dateFormat,inputCalendar.getPopupButtonString()),null);
+ dateFormat,inputCalendar.getPopupButtonString()+"\n"),null);
writer.endElement(HTML.SCRIPT_ELEM);
}
}
@@ -409,7 +409,7 @@
script.append("\"");
}
- script.append(");");
+ script.append(");\n");
}
private String getScriptBtn(FacesContext facesContext, UIComponent uiComponent, String dateFormat, String popupButtonString)
@@ -421,7 +421,7 @@
HtmlInputCalendar calendar = (HtmlInputCalendar)uiComponent;
boolean renderButtonAsImage = calendar.isRenderPopupButtonAsImage();
- writer.write("if (!document.layers) {\n");
+ writer.write("\nif (!document.layers) {\n");
writer.write("document.write('");
if (!renderButtonAsImage) {
@@ -434,13 +434,13 @@
if(popupButtonString==null)
popupButtonString="...";
writer.writeAttribute(HTML.VALUE_ATTR, StringEscapeUtils.escapeJavaScript(popupButtonString), null);
-
+
String popupButtonStyle = calendar.getPopupButtonStyle();
if(popupButtonStyle != null)
{
writer.writeAttribute(HTML.STYLE_ATTR, popupButtonStyle, null);
}
-
+
String popupButtonStyleClass = calendar.getPopupButtonStyleClass();
if(popupButtonStyleClass != null)
{
@@ -463,7 +463,7 @@
{
writer.writeAttribute(HTML.SRC_ATTR, addResource.getResourceUri(facesContext, HtmlCalendarRenderer.class, "images/calendar.gif"), null);
}
-
+
String popupButtonStyle = calendar.getPopupButtonStyle();
if(popupButtonStyle != null)
{
@@ -473,7 +473,7 @@
{
writer.writeAttribute(HTML.STYLE_ATTR, "vertical-align:bottom;", null);
}
-
+
String popupButtonStyleClass = calendar.getPopupButtonStyleClass();
if(popupButtonStyleClass != null)
{
@@ -504,7 +504,7 @@
writer.writeAttribute(HTML.ONCLICK_ATTR, jsCalendarFunctionCall, null);
}
-
+
private void writeMonthYearHeader(FacesContext facesContext, ResponseWriter writer, UIInput inputComponent, Calendar timeKeeper,
int currentDay, String[] weekdays,
String[] months)