Author: jkuhnert
Date: Sun May 6 17:54:47 2007
New Revision: 535699
URL: http://svn.apache.org/viewvc?view=rev&rev=535699
Log:
Fixes TAPESTRY-1214.
Modified:
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/SubmitBindings.script
tapestry/tapestry4/trunk/tapestry-portlet/src/java/org/apache/tapestry/portlet/PortletRendererImpl.java
tapestry/tapestry4/trunk/tapestry-portlet/src/java/org/apache/tapestry/portlet/PortletResponseRenderer.java
Modified:
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/SubmitBindings.script
URL:
http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/SubmitBindings.script?view=diff&rev=535699&r1=535698&r2=535699
==============================================================================
---
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/SubmitBindings.script
(original)
+++
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/SubmitBindings.script
Sun May 6 17:54:47 2007
@@ -18,11 +18,21 @@
"onclick", "event${key}");
tapestry.event${key}=function(e){
dojo.event.browser.stopEvent(e);
- <if expression="type != null">
- tapestry.form.${type}("${submit.form.clientId}",
"${submit.name}", ${parms});
+ <if expression="parms != null">
+ <if expression="type != null">
+ tapestry.form.${type}("${submit.form.clientId}",
"${submit.name}", ${parms});
+ </if>
+ <if-not expression="type != null">
+ tapestry.form.submit("${submit.form.clientId}",
"${submit.name}", ${parms});
+ </if-not>
</if>
- <if-not expression="type != null">
- tapestry.form.submit("${submit.form.clientId}",
"${submit.name}", ${parms});
+ <if-not expression="parms != null">
+ <if expression="type != null">
+ tapestry.form.${type}("${submit.form.clientId}",
"${submit.name}");
+ </if>
+ <if-not expression="type != null">
+ tapestry.form.submit("${submit.form.clientId}",
"${submit.name}");
+ </if-not>
</if-not>
};
dojo.event.connect(dojo.byId("${submit.clientId}"), "onclick",
tapestry, "event${key}");
Modified:
tapestry/tapestry4/trunk/tapestry-portlet/src/java/org/apache/tapestry/portlet/PortletRendererImpl.java
URL:
http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-portlet/src/java/org/apache/tapestry/portlet/PortletRendererImpl.java?view=diff&rev=535699&r1=535698&r2=535699
==============================================================================
---
tapestry/tapestry4/trunk/tapestry-portlet/src/java/org/apache/tapestry/portlet/PortletRendererImpl.java
(original)
+++
tapestry/tapestry4/trunk/tapestry-portlet/src/java/org/apache/tapestry/portlet/PortletRendererImpl.java
Sun May 6 17:54:47 2007
@@ -14,10 +14,6 @@
package org.apache.tapestry.portlet;
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.util.Date;
-
import org.apache.tapestry.IMarkupWriter;
import org.apache.tapestry.IPage;
import org.apache.tapestry.IRequestCycle;
@@ -29,6 +25,10 @@
import org.apache.tapestry.util.ContentType;
import org.apache.tapestry.web.WebResponse;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.util.Date;
+
/**
* The guts of rendering a page as a portlet response; used by
* [EMAIL PROTECTED] org.apache.tapestry.portlet.RenderService} and
@@ -59,8 +59,7 @@
PrintWriter printWriter = _response.getPrintWriter(contentType);
- IMarkupWriter writer = _markupWriterSource.newMarkupWriter(printWriter,
- contentType);
+ IMarkupWriter writer =
_markupWriterSource.newMarkupWriter(printWriter, contentType);
String namespace = _response.getNamespace();
Modified:
tapestry/tapestry4/trunk/tapestry-portlet/src/java/org/apache/tapestry/portlet/PortletResponseRenderer.java
URL:
http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-portlet/src/java/org/apache/tapestry/portlet/PortletResponseRenderer.java?view=diff&rev=535699&r1=535698&r2=535699
==============================================================================
---
tapestry/tapestry4/trunk/tapestry-portlet/src/java/org/apache/tapestry/portlet/PortletResponseRenderer.java
(original)
+++
tapestry/tapestry4/trunk/tapestry-portlet/src/java/org/apache/tapestry/portlet/PortletResponseRenderer.java
Sun May 6 17:54:47 2007
@@ -14,13 +14,13 @@
package org.apache.tapestry.portlet;
-import javax.portlet.ActionResponse;
-import javax.portlet.PortletRequest;
-
import org.apache.tapestry.IRequestCycle;
import org.apache.tapestry.services.ResponseRenderer;
import org.apache.tapestry.services.ServiceConstants;
+import javax.portlet.ActionResponse;
+import javax.portlet.PortletRequest;
+
/**
* Sets render parameters on the current [EMAIL PROTECTED]
javax.portlet.ActionResponse}
* that will invoke the [EMAIL PROTECTED]
org.apache.tapestry.portlet.RenderService} to
@@ -34,7 +34,6 @@
*/
public class PortletResponseRenderer implements ResponseRenderer
{
-
private PortletRequest _request;
private ActionResponse _response;
@@ -42,14 +41,11 @@
public void renderResponse(IRequestCycle cycle)
{
String pageName = cycle.getPage().getPageName();
-
- _response.setRenderParameter(ServiceConstants.SERVICE,
- PortletConstants.RENDER_SERVICE);
+
+ _response.setRenderParameter(ServiceConstants.SERVICE,
PortletConstants.RENDER_SERVICE);
_response.setRenderParameter(ServiceConstants.PAGE, pageName);
- _response.setRenderParameter(PortletConstants.PORTLET_MODE, _request
- .getPortletMode().toString());
- _response.setRenderParameter(PortletConstants.WINDOW_STATE, _request
- .getWindowState().toString());
+ _response.setRenderParameter(PortletConstants.PORTLET_MODE,
_request.getPortletMode().toString());
+ _response.setRenderParameter(PortletConstants.WINDOW_STATE,
_request.getWindowState().toString());
}
public void setResponse(ActionResponse response)
