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 2006/09/10 07:44:49 UTC
svn commit: r441911 - in
/myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/renderkit/html:
HtmlLinkRendererBase.java HtmlRendererUtils.java util/JavascriptUtils.java
Author: mmarinschek
Date: Sat Sep 9 22:44:48 2006
New Revision: 441911
URL: http://svn.apache.org/viewvc?view=rev&rev=441911
Log:
Pretty-HTML parameter is finally put to use. Special script rendering modes for JavaScripts in implementation, depending on Pretty-HTML-parameter
Modified:
myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlLinkRendererBase.java
myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlRendererUtils.java
myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/renderkit/html/util/JavascriptUtils.java
Modified: myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlLinkRendererBase.java
URL: http://svn.apache.org/viewvc/myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlLinkRendererBase.java?view=diff&rev=441911&r1=441910&r2=441911
==============================================================================
--- myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlLinkRendererBase.java (original)
+++ myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlLinkRendererBase.java Sat Sep 9 22:44:48 2006
@@ -220,7 +220,7 @@
String target = getTarget(component);
- onClick.append("return myFaces_submitForm_").append(formName).append("('").
+ onClick.append("return myFaces_submitForm_").append(JavascriptUtils.getValidJavascriptName(formName,false)).append("('").
append(clientId).append("',").
append(params).append(",").
append(target == null ? "null" : ("'" + target + "'")).
Modified: myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlRendererUtils.java
URL: http://svn.apache.org/viewvc/myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlRendererUtils.java?view=diff&rev=441911&r1=441910&r2=441911
==============================================================================
--- myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlRendererUtils.java (original)
+++ myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlRendererUtils.java Sat Sep 9 22:44:48 2006
@@ -838,7 +838,8 @@
{
String formName = formInfo.getFormName();
- context.append("function myFaces_submitForm_").append(formName).append("(linkId, target, params)");
+ context.append("function myFaces_submitForm_").append(
+ JavascriptUtils.getValidJavascriptName(formName,false)).append("(linkId, target, params)");
context.append("{");
//call the script to clear the form (clearFormHiddenParams_<formName>) method
@@ -1017,25 +1018,31 @@
writer.startElement(HTML.SCRIPT_ELEM, null);
writer.writeAttribute(HTML.TYPE_ATTR, "text/javascript", null);
- StringBuffer script = new StringBuffer();
+ ScriptContext script = new ScriptContext(MyfacesConfig.getCurrentInstance(
+ FacesContext.getCurrentInstance().getExternalContext()).isPrettyHtml());
+
+ script.prettyLineIncreaseIndent();
script.append("function ");
script.append(functionName);
//the parameter in the following parameter list is added for compatibility to the RI
//of course, it isn't necessary - the current form is defined
//already by the formName passed as a parameter to this function, and included in the name of the function
- script.append("(currFormName) {");
+ script.append("(currFormName)");
+ script.append("{");
if (dummyFormParams != null) {
- script.append("\n var f = document.forms[");
+ script.append("var f = document.forms[");
script.append("'").append(formName).append("'");
script.append("];");
for (Iterator it = dummyFormParams.iterator(); it.hasNext();) {
- script.append("\n f.elements['");
+ script.prettyLine();
+ script.append("f.elements['");
script.append((String) it.next());
script.append("'].value='';");
}
+ script.prettyLine();
}
// clear form target
- script.append("\n f.target=");
+ script.append("f.target=");
if (formTarget == null || formTarget.length() == 0) {
//Normally one would think that setting target to null has the
//desired effect, but once again IE is different...
@@ -1047,12 +1054,12 @@
script.append(formTarget);
script.append("';");
}
- script.append("\n}");
+ script.append("}");
//To be sure, we call this clear method on each load.
//If we don't do this and someone submits a form by pressing Enter
//within a text input, the hidden inputs won't be cleared!
- script.append("\n");
+ script.prettyLine();
script.append(functionName);
script.append("();");
Modified: myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/renderkit/html/util/JavascriptUtils.java
URL: http://svn.apache.org/viewvc/myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/renderkit/html/util/JavascriptUtils.java?view=diff&rev=441911&r1=441910&r2=441911
==============================================================================
--- myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/renderkit/html/util/JavascriptUtils.java (original)
+++ myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/renderkit/html/util/JavascriptUtils.java Sat Sep 9 22:44:48 2006
@@ -317,24 +317,37 @@
writer.startElement(HTML.SCRIPT_ELEM,null);
writer.writeAttribute(org.apache.myfaces.shared.renderkit.html.HTML.SCRIPT_TYPE_ATTR,org.apache.myfaces.shared.renderkit.html.HTML.SCRIPT_TYPE_TEXT_JAVASCRIPT,null);
- StringBuffer script = new StringBuffer();
+ HtmlRendererUtils.ScriptContext script = new HtmlRendererUtils.ScriptContext(
+ MyfacesConfig.getCurrentInstance(facesContext.getExternalContext()).isPrettyHtml());
+
+ script.prettyLineIncreaseIndent();
script.append("function ");
script.append(AUTO_SCROLL_FUNCTION);
- script.append("() {\n");
- script.append(" var x = 0; var y = 0;\n");
- script.append( " if (self.pageXOffset || self.pageYOffset) {\n"+
- " x = self.pageXOffset;\n" +
- " y = self.pageYOffset;\n" +
- " } else if ((document.documentElement && document.documentElement.scrollLeft)||(document.documentElement && document.documentElement.scrollTop)) {\n" +
- " x = document.documentElement.scrollLeft;\n" +
- " y = document.documentElement.scrollTop;\n" +
- " } else if (document.body) {\n" +
- " x = document.body.scrollLeft;\n" +
- " y = document.body.scrollTop;\n" +
- " }\n" +
- " return x + \",\" + y;\n" +
- "}\n");
+ script.append("()");
+ script.append("{");
+ script.append("var x = 0; var y = 0;");
+ script.append( "if (self.pageXOffset || self.pageYOffset)");
+ script.append("{");
+ script.append("x = self.pageXOffset;");
+ script.prettyLine();
+ script.append("y = self.pageYOffset;");
+ script.append("}");
+ script.append(" else if ((document.documentElement && document.documentElement.scrollLeft)||(document.documentElement && document.documentElement.scrollTop))");
+ script.append("{");
+ script.append("x = document.documentElement.scrollLeft;");
+ script.prettyLine();
+ script.append("y = document.documentElement.scrollTop;");
+ script.append("}");
+ script.append(" else if (document.body) ");
+ script.append("{");
+ script.append("x = document.body.scrollLeft;");
+ script.prettyLine();
+ script.append("y = document.body.scrollTop;");
+ script.append("}");
+ script.append("return x + \",\" + y;");
+ script.append("}");
+
ExternalContext externalContext = facesContext.getExternalContext();
String oldViewId = getOldViewId(externalContext);
if (oldViewId != null && oldViewId.equals(facesContext.getViewRoot().getViewId()))