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:11:44 UTC
svn commit: r289255 - in
/myfaces/share/trunk/src/java/org/apache/myfaces/renderkit/html:
HtmlRendererUtils.java HtmlResponseWriterImpl.java util/JavascriptUtils.java
Author: mmarinschek
Date: Thu Sep 15 08:11:35 2005
New Revision: 289255
URL: http://svn.apache.org/viewcvs?rev=289255&view=rev
Log:
tried to get rid of <!-- in the source base - should get us a major step closer to xhtml compliance
Modified:
myfaces/share/trunk/src/java/org/apache/myfaces/renderkit/html/HtmlRendererUtils.java
myfaces/share/trunk/src/java/org/apache/myfaces/renderkit/html/HtmlResponseWriterImpl.java
myfaces/share/trunk/src/java/org/apache/myfaces/renderkit/html/util/JavascriptUtils.java
Modified: myfaces/share/trunk/src/java/org/apache/myfaces/renderkit/html/HtmlRendererUtils.java
URL: http://svn.apache.org/viewcvs/myfaces/share/trunk/src/java/org/apache/myfaces/renderkit/html/HtmlRendererUtils.java?rev=289255&r1=289254&r2=289255&view=diff
==============================================================================
--- myfaces/share/trunk/src/java/org/apache/myfaces/renderkit/html/HtmlRendererUtils.java (original)
+++ myfaces/share/trunk/src/java/org/apache/myfaces/renderkit/html/HtmlRendererUtils.java Thu Sep 15 08:11:35 2005
@@ -831,7 +831,8 @@
String functionName = getClearHiddenCommandFormParamsFunctionName(formName);
writer.startElement(HTML.SCRIPT_ELEM, null);
writer.writeAttribute(HTML.TYPE_ATTR, "text/javascript", null);
- // Use writeComment instead of write with <!-- tag
+
+ // Using writeComment instead of write with <!-- tag
StringBuffer script = new StringBuffer();
script.append("\nfunction ");
script.append(functionName);
Modified: myfaces/share/trunk/src/java/org/apache/myfaces/renderkit/html/HtmlResponseWriterImpl.java
URL: http://svn.apache.org/viewcvs/myfaces/share/trunk/src/java/org/apache/myfaces/renderkit/html/HtmlResponseWriterImpl.java?rev=289255&r1=289254&r2=289255&view=diff
==============================================================================
--- myfaces/share/trunk/src/java/org/apache/myfaces/renderkit/html/HtmlResponseWriterImpl.java (original)
+++ myfaces/share/trunk/src/java/org/apache/myfaces/renderkit/html/HtmlResponseWriterImpl.java Thu Sep 15 08:11:35 2005
@@ -151,7 +151,16 @@
{
if (! JavascriptUtils.isJavascriptDetected(facesContext.getExternalContext()))
{
- write("<script type=\"text/javascript\">\n<!--\ndocument.location.replace('" + facesContext.getApplication().getViewHandler().getResourceURL(facesContext, "/_javascriptDetector_") + "?goto=" + facesContext.getApplication().getViewHandler().getActionURL(facesContext, facesContext.getViewRoot().getViewId()) +"');\n//-->\n</script>");
+
+ startElement(HTML.SCRIPT_ELEM,null);
+ writeAttribute(HTML.SCRIPT_TYPE_ATTR,HTML.SCRIPT_TYPE_TEXT_JAVASCRIPT,null);
+ StringBuffer script = new StringBuffer();
+ script.append("\n");
+ script.append("document.location.replace('").
+ append(facesContext.getApplication().getViewHandler().getResourceURL(facesContext, "/_javascriptDetector_")).append("?goto=").append(facesContext.getApplication().getViewHandler().getActionURL(facesContext, facesContext.getViewRoot().getViewId())).append("');");
+ script.append("\n//");
+ writeComment(script.toString());
+ endElement(HTML.SCRIPT_ELEM);
}
}
Modified: myfaces/share/trunk/src/java/org/apache/myfaces/renderkit/html/util/JavascriptUtils.java
URL: http://svn.apache.org/viewcvs/myfaces/share/trunk/src/java/org/apache/myfaces/renderkit/html/util/JavascriptUtils.java?rev=289255&r1=289254&r2=289255&view=diff
==============================================================================
--- myfaces/share/trunk/src/java/org/apache/myfaces/renderkit/html/util/JavascriptUtils.java (original)
+++ myfaces/share/trunk/src/java/org/apache/myfaces/renderkit/html/util/JavascriptUtils.java Thu Sep 15 08:11:35 2005
@@ -292,9 +292,13 @@
public static void renderAutoScrollFunction(FacesContext facesContext,
ResponseWriter writer) throws IOException
{
- writer.write("\n<script type=\"text/javascript\">\n" +
- "<!--\n" +
- "function " + AUTO_SCROLL_FUNCTION + " {\n" +
+ writer.startElement(HTML.SCRIPT_ELEM,null);
+ writer.writeAttribute(HTML.SCRIPT_TYPE_ATTR,HTML.SCRIPT_TYPE_TEXT_JAVASCRIPT,null);
+
+ StringBuffer script = new StringBuffer();
+
+ script.append("\n");
+ script.append("function " + AUTO_SCROLL_FUNCTION + " {\n" +
" var x = 0; var y = 0;\n" +
" if (document.body && document.body.scrollLeft && !isNaN(document.body.scrollLeft)) {\n" +
" x = document.body.scrollLeft;\n" +
@@ -330,11 +334,14 @@
y = scrolling.substring(comma + 1);
if (y.equals("undefined")) y = "0";
}
- writer.write("window.scrollTo(" + x + "," + y + ");\n");
+ script.append("window.scrollTo(").append(x).append(",").append(y).append(");\n");
}
}
- writer.write("//-->\n" +
- "</script>\n");
+ script.append("\n//");
+
+ writer.writeComment(script);
+
+ writer.endElement(HTML.SCRIPT_ELEM);
}