You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by ba...@apache.org on 2006/02/04 15:10:39 UTC
svn commit: r374866 - in
/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces:
taglib/core/ViewTag.java util/MyFacesJavascriptRendererUtil.java
Author: baranda
Date: Sat Feb 4 06:10:30 2006
New Revision: 374866
URL: http://svn.apache.org/viewcvs?rev=374866&view=rev
Log:
Removed remaining logic from ViewTag.doEndTag() that put in the request the dummyForm,autoscroll, etc. code. Now all this is handled directly from the ExtensionsFilter.
Modified:
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/taglib/core/ViewTag.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/util/MyFacesJavascriptRendererUtil.java
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/taglib/core/ViewTag.java
URL: http://svn.apache.org/viewcvs/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/taglib/core/ViewTag.java?rev=374866&r1=374865&r2=374866&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/taglib/core/ViewTag.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/taglib/core/ViewTag.java Sat Feb 4 06:10:30 2006
@@ -115,16 +115,6 @@
throw new JspException(e);
}
- try {
- // this will generate the javascript code that myfaces needs (dummyform...)
- // and put it in the request. The extensionsFilter will get the value from
- // the request and render it in the "post-parse"
- MyFacesJavascriptRendererUtil.renderCodeBeforeBodyEnd(facesContext);
- } catch (IOException e) {
- log.error("Error preparing MyFacesJavascript", e);
- throw new JspException(e);
- }
-
StateManager stateManager = facesContext.getApplication().getStateManager();
if (!stateManager.isSavingStateInClient(facesContext))
{
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/util/MyFacesJavascriptRendererUtil.java
URL: http://svn.apache.org/viewcvs/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/util/MyFacesJavascriptRendererUtil.java?rev=374866&r1=374865&r2=374866&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/util/MyFacesJavascriptRendererUtil.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/util/MyFacesJavascriptRendererUtil.java Sat Feb 4 06:10:30 2006
@@ -78,7 +78,7 @@
JavascriptUtils.renderAutoScrollFunction(facesContext, writerWrapper);
}
- facesContext.setResponseWriter(responseWriter);
+ //facesContext.setResponseWriter(responseWriter);
facesContext.getExternalContext().getRequestMap().put(ORG_APACHE_MYFACES_MY_FACES_JAVASCRIPT, "<!-- MYFACES JAVASCRIPT -->\n"+writerWrapper.toString()+"\n");
}