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/09/15 17:15:21 UTC
svn commit: r289256 - in
/myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom:
calendar/HtmlCalendarRenderer.java
navmenu/jscookmenu/HtmlJSCookMenuRenderer.java
Author: mmarinschek
Date: Thu Sep 15 08:15:12 2005
New Revision: 289256
URL: http://svn.apache.org/viewcvs?rev=289256&view=rev
Log:
tried to get rid of <!-- in the source base - should get us a major step closer to xhtml compliance
Modified:
myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/calendar/HtmlCalendarRenderer.java
myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/navmenu/jscookmenu/HtmlJSCookMenuRenderer.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=289256&r1=289255&r2=289256&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 Thu Sep 15 08:15:12 2005
@@ -258,12 +258,13 @@
writer.startElement(HTML.SCRIPT_ELEM, component);
writer.writeAttribute(HTML.SCRIPT_TYPE_ATTR, HTML.SCRIPT_TYPE_TEXT_JAVASCRIPT, null);
- writer.write(
- "loadPopupScript();jscalendarSetImageDirectory(\""
- +JavascriptUtils.encodeString(
- AddResource.getResourceMappedPath(HtmlCalendarRenderer.class, "DB/", facesContext)
- )
- +"\")");
+ StringBuffer script = new StringBuffer();
+ script.append("\n");
+ script.append("loadPopupScript();jscalendarSetImageDirectory(\"").append(JavascriptUtils.encodeString(
+ AddResource.getResourceMappedPath(HtmlCalendarRenderer.class, "DB/", facesContext)
+ )).append("\")");
+ script.append("\n//");
+ writer.writeComment(script.toString());
writer.endElement(HTML.SCRIPT_ELEM);
facesContext.getExternalContext().getRequestMap().put(JAVASCRIPT_ENCODED, Boolean.TRUE);
@@ -355,7 +356,7 @@
HtmlInputCalendar calendar = (HtmlInputCalendar)uiComponent;
boolean renderButtonAsImage = calendar.isRenderPopupButtonAsImage();
-
+
writer.write("if (!document.layers) {\n");
writer.write("document.write('");
@@ -363,9 +364,9 @@
// render the button
writer.startElement(HTML.INPUT_ELEM, uiComponent);
writer.writeAttribute(HTML.TYPE_ATTR, HTML.INPUT_TYPE_BUTTON, null);
-
+
writeOnclickJsCalendarFunctionCall(facesContext,uiComponent,dateFormat);
-
+
if(popupButtonString==null)
popupButtonString="...";
writer.writeAttribute(HTML.VALUE_ATTR, popupButtonString, null);
@@ -384,26 +385,26 @@
writer.startElement(HTML.IMG_ELEM, uiComponent);
writer.writeAttribute(HTML.SRC_ATTR, AddResource.getResourceMappedPath(HtmlCalendarRenderer.class, "images/calendar.gif", facesContext), null);
writer.writeAttribute(HTML.STYLE_ATTR, "vertical-align:bottom;", null);
-
+
//writer.writeAttribute(HTML.ONCLICK_ATTR, "document.getElementById(\\'"+buttonId+"\\').click()",null);
writeOnclickJsCalendarFunctionCall(facesContext,uiComponent,dateFormat);
//writer.writeAttribute(HTML.ONMOUSEOVER_ATTR, "this.style.cursor=\\'hand\\';", null);
//writer.writeAttribute(HTML.ONMOUSEOUT_ATTR, "this.style.cursor=\\'default\\';", null);
-
+
writer.endElement(HTML.IMG_ELEM);
}
writer.write("');");
writer.write("\n}");
}
-
- private void writeOnclickJsCalendarFunctionCall(FacesContext facesContext, UIComponent uiComponent, String dateFormat)
+
+ private void writeOnclickJsCalendarFunctionCall(FacesContext facesContext, UIComponent uiComponent, String dateFormat)
throws IOException
{
String clientId = uiComponent.getClientId(facesContext);
-
+
ResponseWriter writer = facesContext.getResponseWriter();
-
+
String jsCalendarFunctionCall = "jscalendarPopUpCalendar(this,document.getElementById(\\'"+clientId+"\\'),\\'"+dateFormat+"\\')";
writer.writeAttribute(HTML.ONCLICK_ATTR, jsCalendarFunctionCall, null);
}
Modified: myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/navmenu/jscookmenu/HtmlJSCookMenuRenderer.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/navmenu/jscookmenu/HtmlJSCookMenuRenderer.java?rev=289256&r1=289255&r2=289256&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/navmenu/jscookmenu/HtmlJSCookMenuRenderer.java (original)
+++ myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/navmenu/jscookmenu/HtmlJSCookMenuRenderer.java Thu Sep 15 08:15:12 2005
@@ -22,6 +22,7 @@
import org.apache.myfaces.el.SimpleActionMethodBinding;
import org.apache.myfaces.renderkit.RendererUtils;
import org.apache.myfaces.renderkit.html.HtmlRenderer;
+import org.apache.myfaces.renderkit.html.HTML;
import org.apache.myfaces.renderkit.html.util.DummyFormResponseWriter;
import org.apache.myfaces.renderkit.html.util.DummyFormUtils;
import org.apache.myfaces.renderkit.html.util.JavascriptUtils;
@@ -129,15 +130,19 @@
ResponseWriter writer = context.getResponseWriter();
- writer.write("\n<script type=\"text/javascript\"><!--\n" +
- "var " + getMenuId( context, component ) + " =\n[");
+ writer.startElement(HTML.SCRIPT_ELEM,component);
+ writer.writeAttribute(HTML.SCRIPT_TYPE_ATTR,HTML.SCRIPT_TYPE_TEXT_JAVASCRIPT, null);
+ StringBuffer script = new StringBuffer();
+ script.append("\n" + "var ").append(getMenuId(context, component)).append(" =\n[");
encodeNavigationMenuItems(context, writer,
(NavigationMenuItem[]) list.toArray(new NavigationMenuItem[list.size()]),
uiNavMenuItemList,
myId);
- writer.write("];\n" +
- "--></script>\n");
+ script.append("];");
+ script.append("\n//");
+ writer.writeComment(script.toString());
+ writer.endElement(HTML.SCRIPT_ELEM);
}
}