myfaces-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bom...@apache.org
Subject svn commit: r1792190 - in /myfaces/trinidad/trunk/trinidad-impl/src: main/java/org/apache/myfaces/trinidadinternal/renderkit/core/pda/ main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/ test/java/org/apache/myfaces/trinidadinternal/ren...
Date Fri, 21 Apr 2017 11:45:52 GMT
Author: bommel
Date: Fri Apr 21 11:45:52 2017
New Revision: 1792190

URL: http://svn.apache.org/viewvc?rev=1792190&view=rev
Log:
(TRINIDAD-2551) 
Add Pass-through attributes support

Modified:
    myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/pda/PdaFrameBorderLayoutRenderer.java
    myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/HiddenLabelUtils.java
    myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/LabelAndMessageRenderer.java
    myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/MediaRenderer.java
    myfaces/trinidad/trunk/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/GatherContent.java

Modified: myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/pda/PdaFrameBorderLayoutRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/pda/PdaFrameBorderLayoutRenderer.java?rev=1792190&r1=1792189&r2=1792190&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/pda/PdaFrameBorderLayoutRenderer.java
(original)
+++ myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/pda/PdaFrameBorderLayoutRenderer.java
Fri Apr 21 11:45:52 2017
@@ -136,7 +136,7 @@ public class PdaFrameBorderLayoutRendere
     if (component != null)
     {
       encodeChild(context, component);
-      context.getResponseWriter().startElement("br", component);
+      context.getResponseWriter().startElement("br", null);
       context.getResponseWriter().endElement("br");
     }
   }

Modified: myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/HiddenLabelUtils.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/HiddenLabelUtils.java?rev=1792190&r1=1792189&r2=1792190&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/HiddenLabelUtils.java
(original)
+++ myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/HiddenLabelUtils.java
Fri Apr 21 11:45:52 2017
@@ -147,7 +147,7 @@ public class HiddenLabelUtils
     if (text != null)
     {
       ResponseWriter writer = context.getResponseWriter();
-      writer.startElement("label", component);
+      writer.startElement("label", null);
       writer.writeAttribute("for", id, null);
       XhtmlRenderer.renderStyleClass(context, arc,
                                      SkinSelectors.HIDDEN_LABEL_STYLE_CLASS);

Modified: myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/LabelAndMessageRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/LabelAndMessageRenderer.java?rev=1792190&r1=1792189&r2=1792190&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/LabelAndMessageRenderer.java
(original)
+++ myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/LabelAndMessageRenderer.java
Fri Apr 21 11:45:52 2017
@@ -300,7 +300,7 @@ public abstract class LabelAndMessageRen
         OutputUtils.renderLayoutTableAttributes(context, rc, "0", null);
       }
 
-      rw.startElement("tr", component);
+      rw.startElement("tr", null);
 
       if (!needsTableTag)
       {

Modified: myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/MediaRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/MediaRenderer.java?rev=1792190&r1=1792189&r2=1792190&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/MediaRenderer.java
(original)
+++ myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/MediaRenderer.java
Fri Apr 21 11:45:52 2017
@@ -495,7 +495,7 @@ public class MediaRenderer extends Xhtml
     {
       if (id != null)
       {
-        writer.startElement("span", component);
+        writer.startElement("span", null);
         writer.writeAttribute("id", id, null);
         renderAllAttributes(context, rc, component, bean);
         writer.endElement("span");
@@ -525,7 +525,7 @@ public class MediaRenderer extends Xhtml
       {
         // =-=AEW Just noticed: this code fails to render "alt"; before
         // using, check accessibility!!!
-        writer.startElement("img", component);
+        writer.startElement("img", null);
         renderEncodedResourceURI(context, "src", iconUrl);
         writer.endElement("img");
       }

Modified: myfaces/trinidad/trunk/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/GatherContent.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/GatherContent.java?rev=1792190&r1=1792189&r2=1792190&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/GatherContent.java
(original)
+++ myfaces/trinidad/trunk/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/GatherContent.java
Fri Apr 21 11:45:52 2017
@@ -26,6 +26,7 @@ import javax.faces.context.ResponseWrite
 import javax.faces.component.UIComponent;
 import javax.faces.component.UIComponentBase;
 
+import org.apache.myfaces.trinidad.component.core.output.CoreOutputLabel;
 import org.apache.myfaces.trinidad.context.RenderingContext;
 
 import junit.framework.AssertionFailedError;
@@ -143,7 +144,8 @@ public class GatherContent extends UICom
       int depth = _depth++;
       if (depth == 0)
       {
-        if (!"script".equals(name) && (!"link".equals(name)))
+        if (!("script".equals(name) || "link".equals(name)
+                || ("label".equals(name) && !(_child instanceof CoreOutputLabel))))
         {
           if (component == null)
           {



Mime
View raw message