You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lu...@apache.org on 2014/01/07 19:19:14 UTC
svn commit: r1556299 - in /myfaces/shared/trunk_4.0.x/core: pom.xml
src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlRendererUtils.java
Author: lu4242
Date: Tue Jan 7 18:19:14 2014
New Revision: 1556299
URL: http://svn.apache.org/r1556299
Log:
synch shared
Modified:
myfaces/shared/trunk_4.0.x/core/pom.xml
myfaces/shared/trunk_4.0.x/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlRendererUtils.java
Modified: myfaces/shared/trunk_4.0.x/core/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/shared/trunk_4.0.x/core/pom.xml?rev=1556299&r1=1556298&r2=1556299&view=diff
==============================================================================
--- myfaces/shared/trunk_4.0.x/core/pom.xml (original)
+++ myfaces/shared/trunk_4.0.x/core/pom.xml Tue Jan 7 18:19:14 2014
@@ -143,7 +143,7 @@
<profile>
<id>synch-myfaces-impl-shared</id>
<properties>
- <myfaces.impl.shared.version>2.0.19-SNAPSHOT</myfaces.impl.shared.version>
+ <myfaces.impl.shared.version>2.0.20-SNAPSHOT</myfaces.impl.shared.version>
</properties>
<activation>
<property>
Modified: myfaces/shared/trunk_4.0.x/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlRendererUtils.java
URL: http://svn.apache.org/viewvc/myfaces/shared/trunk_4.0.x/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlRendererUtils.java?rev=1556299&r1=1556298&r2=1556299&view=diff
==============================================================================
--- myfaces/shared/trunk_4.0.x/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlRendererUtils.java (original)
+++ myfaces/shared/trunk_4.0.x/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlRendererUtils.java Tue Jan 7 18:19:14 2014
@@ -2017,7 +2017,9 @@ public final class HtmlRendererUtils
target.append(", ");
}
}
- if (!submitting)
+ // MYFACES-3836 If no script provided by the client behavior, ignore the
+ // submitting hint because. it is evidence the client behavior is disabled.
+ if (script != null && !submitting)
{
submitting = clientBehavior.getHints().contains(
ClientBehaviorHint.SUBMITTING);