You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by ma...@apache.org on 2008/06/30 19:41:24 UTC
svn commit: r672836 - in /myfaces/trinidad/trunk/trinidad-impl/src/main:
java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/FormRenderer.java
javascript/META-INF/adf/jsLibs/Core.js
Author: matzew
Date: Mon Jun 30 10:41:23 2008
New Revision: 672836
URL: http://svn.apache.org/viewvc?rev=672836&view=rev
Log:
TRINIDAD-917 - tr:form defaultCommand does no partial triggering
Modified:
myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/FormRenderer.java
myfaces/trinidad/trunk/trinidad-impl/src/main/javascript/META-INF/adf/jsLibs/Core.js
Modified: myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/FormRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/FormRenderer.java?rev=672836&r1=672835&r2=672836&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/FormRenderer.java (original)
+++ myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/FormRenderer.java Mon Jun 30 10:41:23 2008
@@ -957,7 +957,7 @@
String defaultCommand = getDefaultCommand(bean);
- String submitFunc;
+ String submitFunc = null;
UIComponent defaultCommandComponent = null;
if (defaultCommand != null)
@@ -977,10 +977,25 @@
{
immediate = 0;
}
- submitFunc = "return _submitOnEnter"
- + "(event,'" + clientId
- + "'," + "'" + defaultCommandId
- + "'," + immediate +");";
+ //PPR
+ Boolean ppr = (Boolean) defaultCommandComponent.getAttributes().get("partialSubmit");
+ if(ppr != null && ppr)
+ {
+ submitFunc = "return _submitOnEnter"
+ + "(event,'" + clientId
+ + "'," + "'" + defaultCommandId
+ + "'," + immediate
+ + "," + true +");";
+ }
+ //no PPR
+ else
+ {
+ submitFunc = "return _submitOnEnter"
+ + "(event,'" + clientId
+ + "'," + "'" + defaultCommandId
+ + "'," + immediate
+ + "," + false +");";
+ }
}
else
{
Modified: myfaces/trinidad/trunk/trinidad-impl/src/main/javascript/META-INF/adf/jsLibs/Core.js
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-impl/src/main/javascript/META-INF/adf/jsLibs/Core.js?rev=672836&r1=672835&r2=672836&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-impl/src/main/javascript/META-INF/adf/jsLibs/Core.js (original)
+++ myfaces/trinidad/trunk/trinidad-impl/src/main/javascript/META-INF/adf/jsLibs/Core.js Mon Jun 30 10:41:23 2008
@@ -1861,7 +1861,7 @@
* This function is called when enter key is hit on any form input element.
* @src if non-null, the ID of the object to fire
*/
-function _submitOnEnter(e, frm, src, immediate)
+function _submitOnEnter(e, frm, src, immediate, ppr)
{
if (window.event != null)
e = window.event;
@@ -1890,7 +1890,14 @@
params[src] = src;
params['source'] = src;
- submitForm(frm,immediate,params);
+ if(ppr != true)
+ {
+ submitForm(frm,immediate,params);
+ }
+ else
+ {
+ TrPage._autoSubmit(frm, src, e, immediate, params);
+ }
}
return false;