You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by dr...@apache.org on 2007/10/26 16:57:29 UTC
svn commit: r588675 - in /myfaces/trinidad/trunk/trinidad/trinidad-impl/src:
main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/
test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/
test/resources/org/apache/myfaces/trin...
Author: drobinson
Date: Fri Oct 26 07:57:28 2007
New Revision: 588675
URL: http://svn.apache.org/viewvc?rev=588675&view=rev
Log:
TRINIDAD-144, TRINIDAD-783
Cleaned up message renderer code and consolidated rendering logic for server-side and client-side validation into single block. Removed duplicate spans for client-side validation, so issues with duplicate messages should be resolved. Also cleaned up default style for messages to remove the use of p_OraDisplayBlock from OraInlineInfoText style, so strange layout behavior should be resolve in IE.
Modified:
myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/MessageRenderer.java
myfaces/trinidad/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/message-facet-minimal-golden.xml
myfaces/trinidad/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/message-facet-minimalIE-golden.xml
myfaces/trinidad/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/message-facet-minimalIERtl-golden.xml
myfaces/trinidad/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/message-facet-minimalInacc-golden.xml
myfaces/trinidad/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/message-facet-minimalPPC-golden.xml
myfaces/trinidad/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/message-facet-minimalSaf-golden.xml
myfaces/trinidad/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/message-facet-minimalScrRdr-golden.xml
myfaces/trinidad/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/testScripts/message.xml
Modified: myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/MessageRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/MessageRenderer.java?rev=588675&r1=588674&r2=588675&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/MessageRenderer.java (original)
+++ myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/MessageRenderer.java Fri Oct 26 07:57:28 2007
@@ -142,7 +142,6 @@
if (shouldRenderId(context, component))
writer.writeAttribute(XhtmlConstants.ID_ATTRIBUTE,
forId + "::help", null);
- renderId(context, component);
renderAllAttributes(context, arc, bean, false);
renderStyleAttributes(context, arc, bean, SkinSelectors.INLINE_INFO_TEXT_STYLE_CLASS);
Modified: myfaces/trinidad/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/message-facet-minimal-golden.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/message-facet-minimal-golden.xml?rev=588675&r1=588674&r2=588675&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/message-facet-minimal-golden.xml (original)
+++ myfaces/trinidad/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/message-facet-minimal-golden.xml Fri Oct 26 07:57:28 2007
@@ -1,7 +1,7 @@
<results>
<span
class="OraInlineInfoText"
- id="mainId"
+ id="other::help"
>
help text
</span>
Modified: myfaces/trinidad/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/message-facet-minimalIE-golden.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/message-facet-minimalIE-golden.xml?rev=588675&r1=588674&r2=588675&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/message-facet-minimalIE-golden.xml (original)
+++ myfaces/trinidad/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/message-facet-minimalIE-golden.xml Fri Oct 26 07:57:28 2007
@@ -1,7 +1,7 @@
<results>
<span
class="OraInlineInfoText"
- id="mainId"
+ id="other::help"
>
help text
</span>
Modified: myfaces/trinidad/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/message-facet-minimalIERtl-golden.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/message-facet-minimalIERtl-golden.xml?rev=588675&r1=588674&r2=588675&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/message-facet-minimalIERtl-golden.xml (original)
+++ myfaces/trinidad/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/message-facet-minimalIERtl-golden.xml Fri Oct 26 07:57:28 2007
@@ -1,7 +1,7 @@
<results>
<span
class="OraInlineInfoText"
- id="mainId"
+ id="other::help"
>
help text
</span>
Modified: myfaces/trinidad/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/message-facet-minimalInacc-golden.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/message-facet-minimalInacc-golden.xml?rev=588675&r1=588674&r2=588675&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/message-facet-minimalInacc-golden.xml (original)
+++ myfaces/trinidad/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/message-facet-minimalInacc-golden.xml Fri Oct 26 07:57:28 2007
@@ -1,7 +1,7 @@
<results>
<span
class="OraInlineInfoText"
- id="mainId"
+ id="other::help"
>
help text
</span>
Modified: myfaces/trinidad/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/message-facet-minimalPPC-golden.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/message-facet-minimalPPC-golden.xml?rev=588675&r1=588674&r2=588675&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/message-facet-minimalPPC-golden.xml (original)
+++ myfaces/trinidad/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/message-facet-minimalPPC-golden.xml Fri Oct 26 07:57:28 2007
@@ -1,7 +1,7 @@
<results>
<span
class="OraInlineInfoText"
- id="mainId"
+ id="other::help"
>
help text
</span>
Modified: myfaces/trinidad/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/message-facet-minimalSaf-golden.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/message-facet-minimalSaf-golden.xml?rev=588675&r1=588674&r2=588675&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/message-facet-minimalSaf-golden.xml (original)
+++ myfaces/trinidad/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/message-facet-minimalSaf-golden.xml Fri Oct 26 07:57:28 2007
@@ -1,7 +1,7 @@
<results>
<span
class="OraInlineInfoText"
- id="mainId"
+ id="other::help"
>
help text
</span>
Modified: myfaces/trinidad/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/message-facet-minimalScrRdr-golden.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/message-facet-minimalScrRdr-golden.xml?rev=588675&r1=588674&r2=588675&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/message-facet-minimalScrRdr-golden.xml (original)
+++ myfaces/trinidad/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/message-facet-minimalScrRdr-golden.xml Fri Oct 26 07:57:28 2007
@@ -1,7 +1,7 @@
<results>
<span
class="OraInlineInfoText"
- id="mainId"
+ id="other::help"
>
help text
</span>
Modified: myfaces/trinidad/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/testScripts/message.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/testScripts/message.xml?rev=588675&r1=588674&r2=588675&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/testScripts/message.xml (original)
+++ myfaces/trinidad/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/testScripts/message.xml Fri Oct 26 07:57:28 2007
@@ -6,7 +6,7 @@
clientId="other"/>
<attribute-test name="message" value="message_val"/>
- <attribute-test name="id" value="id_val"/>
+ <attribute-test name="id" value="id_val" matchesBase="true"/>
<attribute-test name="messageType" value="error" matchesBase="true"/>
<attribute-test name="messageType" value="warning"/>
<attribute-test name="messageType" value="info"/>