You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by sk...@apache.org on 2005/12/20 11:08:48 UTC
svn commit: r357948 - in /myfaces/impl/trunk/tld:
entities/html_escape_attribute.xml myfaces_html.tld
Author: skitching
Date: Tue Dec 20 02:08:42 2005
New Revision: 357948
URL: http://svn.apache.org/viewcvs?rev=357948&view=rev
Log:
Avoid duplication of definition for "escape" attribute.
Added:
myfaces/impl/trunk/tld/entities/html_escape_attribute.xml
Modified:
myfaces/impl/trunk/tld/myfaces_html.tld
Added: myfaces/impl/trunk/tld/entities/html_escape_attribute.xml
URL: http://svn.apache.org/viewcvs/myfaces/impl/trunk/tld/entities/html_escape_attribute.xml?rev=357948&view=auto
==============================================================================
--- myfaces/impl/trunk/tld/entities/html_escape_attribute.xml (added)
+++ myfaces/impl/trunk/tld/entities/html_escape_attribute.xml Tue Dec 20 02:08:42 2005
@@ -0,0 +1,9 @@
+ <attribute>
+ <name>escape</name>
+ <required>false</required>
+ <rtexprvalue>false</rtexprvalue>
+ <description>
+ Indicates whether rendered markup should be escaped.
+ Default: true
+ </description>
+ </attribute>
\ No newline at end of file
Modified: myfaces/impl/trunk/tld/myfaces_html.tld
URL: http://svn.apache.org/viewcvs/myfaces/impl/trunk/tld/myfaces_html.tld?rev=357948&r1=357947&r2=357948&view=diff
==============================================================================
--- myfaces/impl/trunk/tld/myfaces_html.tld (original)
+++ myfaces/impl/trunk/tld/myfaces_html.tld Tue Dec 20 02:08:42 2005
@@ -27,6 +27,7 @@
<!ENTITY html_anchor_attributes SYSTEM "entities/html_anchor_attributes.xml">
<!ENTITY html_button_attributes SYSTEM "entities/html_button_attributes.xml">
+<!ENTITY html_escape_attribute SYSTEM "entities/html_escape_attribute.xml">
<!ENTITY html_event_handler_attributes SYSTEM "entities/html_event_handler_attributes.xml">
<!ENTITY html_form_attributes SYSTEM "entities/html_form_attributes.xml">
<!ENTITY spec_img_attributes SYSTEM "entities/spec_img_attributes.xml">
@@ -216,7 +217,6 @@
or EL expressions.
</description>
&ui_input_attributes;
- <!-- HiddenRenderer attributes -->
</tag>
<!-- input_secret -->
@@ -368,16 +368,7 @@
&ui_output_attributes;
&html_universal_attributes;
&html_event_handler_attributes;
- <!-- HtmlOutputFormat attributes -->
- <attribute>
- <name>escape</name>
- <required>false</required>
- <rtexprvalue>false</rtexprvalue>
- <description>
- Controls whether HTML entities within the output should be escaped.
- Default: true
- </description>
- </attribute>
+ &html_escape_attribute;
</tag>
<!-- output_text -->
@@ -396,16 +387,7 @@
&ui_output_attributes;
&html_universal_attributes;
&html_event_handler_attributes;
- <!-- HtmlOutputText attributes -->
- <attribute>
- <name>escape</name>
- <required>false</required>
- <rtexprvalue>false</rtexprvalue>
- <description>
- Controls whether HTML entities within the output should be escaped.
- Default: true
- </description>
- </attribute>
+ &html_escape_attribute;
</tag>
<!-- panel_grid -->