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 2017/01/28 00:35:36 UTC
svn commit: r1780620 - in /myfaces/shared/trunk/core: ./
src/main/java/org/apache/myfaces/shared/renderkit/html/
src/main/resources/META-INF/
Author: lu4242
Date: Sat Jan 28 00:35:36 2017
New Revision: 1780620
URL: http://svn.apache.org/viewvc?rev=1780620&view=rev
Log:
synchronize shared
Modified:
myfaces/shared/trunk/core/pom.xml
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/HtmlResponseWriterImpl.java
myfaces/shared/trunk/core/src/main/resources/META-INF/myfaces-metadata.xml
Modified: myfaces/shared/trunk/core/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/shared/trunk/core/pom.xml?rev=1780620&r1=1780619&r2=1780620&view=diff
==============================================================================
--- myfaces/shared/trunk/core/pom.xml (original)
+++ myfaces/shared/trunk/core/pom.xml Sat Jan 28 00:35:36 2017
@@ -143,7 +143,7 @@
<profile>
<id>synch-myfaces-impl-shared</id>
<properties>
- <myfaces.impl.shared.version>2.2.11-SNAPSHOT</myfaces.impl.shared.version>
+ <myfaces.impl.shared.version>2.2.12-SNAPSHOT</myfaces.impl.shared.version>
</properties>
<activation>
<property>
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?rev=1780620&r1=1780619&r2=1780620&view=diff
==============================================================================
--- 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 Jan 28 00:35:36 2017
@@ -66,6 +66,7 @@ import org.apache.myfaces.shared.renderk
import org.apache.myfaces.shared.renderkit.html.util.FormInfo;
import org.apache.myfaces.shared.renderkit.html.util.HTMLEncoder;
import org.apache.myfaces.shared.renderkit.html.util.OutcomeTargetUtils;
+import org.apache.myfaces.shared.util.StringUtils;
public final class HtmlRendererUtils
{
@@ -291,7 +292,20 @@ public final class HtmlRendererUtils
if (clientBehaviorList != null
&& !clientBehaviorList.isEmpty())
{
- String clientId = paramMap.get("javax.faces.source");
+ String sourceId = paramMap.get("javax.faces.source");
+ String componentClientId = component.getClientId(facesContext);
+ String clientId = sourceId;
+ if (sourceId.startsWith(componentClientId) &&
+ sourceId.length() > componentClientId.length())
+ {
+ String item = sourceId.substring(componentClientId.length()+1);
+ // If is item it should be an integer number, otherwise it can be related to a child
+ // component, because that could conflict with the clientId naming convention.
+ if (StringUtils.isInteger(item))
+ {
+ clientId = componentClientId;
+ }
+ }
if (component.getClientId(facesContext).equals(clientId))
{
if (clientBehaviorList instanceof RandomAccess)
Modified: myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlResponseWriterImpl.java
URL: http://svn.apache.org/viewvc/myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlResponseWriterImpl.java?rev=1780620&r1=1780619&r2=1780620&view=diff
==============================================================================
--- myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlResponseWriterImpl.java (original)
+++ myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlResponseWriterImpl.java Sat Jan 28 00:35:36 2017
@@ -435,7 +435,12 @@ public class HtmlResponseWriterImpl
// same here. After all, it is resposibility of the one who set the passthrough
// attribute to do the proper encoding in cases when a URI is provided. However,
// that does not means the attribute should not be encoded as other attributes.
- encodeAndWriteAttribute(key, value);
+ // According to tests done, if passthrough attribute is null, the attribute must not
+ // be rendered.
+ if (value != null)
+ {
+ encodeAndWriteAttribute(key, value);
+ }
}
}
Modified: myfaces/shared/trunk/core/src/main/resources/META-INF/myfaces-metadata.xml
URL: http://svn.apache.org/viewvc/myfaces/shared/trunk/core/src/main/resources/META-INF/myfaces-metadata.xml?rev=1780620&r1=1780619&r2=1780620&view=diff
==============================================================================
--- myfaces/shared/trunk/core/src/main/resources/META-INF/myfaces-metadata.xml (original)
+++ myfaces/shared/trunk/core/src/main/resources/META-INF/myfaces-metadata.xml Sat Jan 28 00:35:36 2017
@@ -8333,6 +8333,12 @@ enabled when Bean Validation binaries ar
Submitted values are decoded as null values instead empty strings.
<p>Note this param is ignored for components extending from UISelectOne/UISelectMany.</p>
+
+<p>Additionally, this parameter has no effect when EL 3.0 is used, due to an issue in the EL 3.0 specification.
+When EL 3.0 is used, a custom ELResolver is needed - in addition to this parameter - to enable the behavior
+described by this parameter. More information about this issue, as well as an example ELResolver, can be found
+here: <a href="https://java.net/jira/browse/JAVASERVERFACES_SPEC_PUBLIC-1203">JAVASERVERFACES_SPEC_PUBLIC-1203
+</a></p>
]]>
</longDesc>
<defaultValue>false</defaultValue>