You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by pa...@apache.org on 2007/01/11 06:25:11 UTC
svn commit: r495124 - in /myfaces: core/trunk/impl/src/main/tld/entities/
shared/trunk/core/src/main/java/org/apache/myfaces/shared/taglib/html/
tomahawk/trunk/examples/simple/src/test/selenium/
Author: paulsp
Date: Wed Jan 10 21:25:08 2007
New Revision: 495124
URL: http://svn.apache.org/viewvc?view=rev&rev=495124
Log:
MYFACES-1519 - Add readonly attribute to <h:commandButton> and tabindex attribute to <h:outputLabel>
Modified:
myfaces/core/trunk/impl/src/main/tld/entities/standard_command_button_attributes.xml
myfaces/core/trunk/impl/src/main/tld/entities/standard_output_label_attributes.xml
myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/taglib/html/HtmlCommandButtonTagBase.java
myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/taglib/html/HtmlOutputLabelTagBase.java
myfaces/tomahawk/trunk/examples/simple/src/test/selenium/TestSuite.html
myfaces/tomahawk/trunk/examples/simple/src/test/selenium/hCommandButtonTest.html
myfaces/tomahawk/trunk/examples/simple/src/test/selenium/hOutputLabelTest.html
Modified: myfaces/core/trunk/impl/src/main/tld/entities/standard_command_button_attributes.xml
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/tld/entities/standard_command_button_attributes.xml?view=diff&rev=495124&r1=495123&r2=495124
==============================================================================
--- myfaces/core/trunk/impl/src/main/tld/entities/standard_command_button_attributes.xml (original)
+++ myfaces/core/trunk/impl/src/main/tld/entities/standard_command_button_attributes.xml Wed Jan 10 21:25:08 2007
@@ -1,6 +1,7 @@
<!-- all standard attributes of the commandButton tag -->
&ui_command_attributes;
&html_universal_attributes;
+ &html_readonly_attribute;
&html_event_handler_attributes;
&html_button_attributes;
<!-- HtmlCommandButton attributes -->
Modified: myfaces/core/trunk/impl/src/main/tld/entities/standard_output_label_attributes.xml
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/tld/entities/standard_output_label_attributes.xml?view=diff&rev=495124&r1=495123&r2=495124
==============================================================================
--- myfaces/core/trunk/impl/src/main/tld/entities/standard_output_label_attributes.xml (original)
+++ myfaces/core/trunk/impl/src/main/tld/entities/standard_output_label_attributes.xml Wed Jan 10 21:25:08 2007
@@ -1,6 +1,7 @@
<!-- all standard attributes of the outputLabel tag -->
&ui_output_attributes;
&html_universal_attributes;
+&html_tabindex_attribute;
&html_event_handler_attributes;
&html_label_attributes;
<!-- LabelRenderer attributes -->
Modified: myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/taglib/html/HtmlCommandButtonTagBase.java
URL: http://svn.apache.org/viewvc/myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/taglib/html/HtmlCommandButtonTagBase.java?view=diff&rev=495124&r1=495123&r2=495124
==============================================================================
--- myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/taglib/html/HtmlCommandButtonTagBase.java (original)
+++ myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/taglib/html/HtmlCommandButtonTagBase.java Wed Jan 10 21:25:08 2007
@@ -50,6 +50,7 @@
private String _onchange;
private String _onfocus;
private String _onselect;
+ private String _readonly;
private String _size;
private String _tabindex;
private String _type;
@@ -71,6 +72,7 @@
_onchange=null;
_onfocus=null;
_onselect=null;
+ _readonly=null;
_size=null;
_tabindex=null;
_type=null;
@@ -86,14 +88,15 @@
setStringProperty(component, HTML.ACCESSKEY_ATTR, _accesskey);
setStringProperty(component, HTML.ALT_ATTR, _alt);
- setBooleanProperty(component, org.apache.myfaces.shared.renderkit.html.HTML.DISABLED_ATTR, _disabled);
+ setBooleanProperty(component, HTML.DISABLED_ATTR, _disabled);
setStringProperty(component, HTML.ONBLUR_ATTR, _onblur);
- setStringProperty(component, org.apache.myfaces.shared.renderkit.html.HTML.ONCHANGE_ATTR, _onchange);
- setStringProperty(component, org.apache.myfaces.shared.renderkit.html.HTML.ONFOCUS_ATTR, _onfocus);
- setStringProperty(component, org.apache.myfaces.shared.renderkit.html.HTML.ONSELECT_ATTR, _onselect);
- setStringProperty(component, org.apache.myfaces.shared.renderkit.html.HTML.SIZE_ATTR, _size);
+ setStringProperty(component, HTML.ONCHANGE_ATTR, _onchange);
+ setStringProperty(component, HTML.ONFOCUS_ATTR, _onfocus);
+ setStringProperty(component, HTML.ONSELECT_ATTR, _onselect);
+ setBooleanProperty(component, HTML.READONLY_ATTR, _readonly);
+ setStringProperty(component, HTML.SIZE_ATTR, _size);
setStringProperty(component, HTML.TABINDEX_ATTR, _tabindex);
- setStringProperty(component, org.apache.myfaces.shared.renderkit.html.HTML.TYPE_ATTR, _type);
+ setStringProperty(component, HTML.TYPE_ATTR, _type);
setActionProperty(component, _action);
setActionListenerProperty(component, _actionListener);
setBooleanProperty(component, JSFAttr.IMMEDIATE_ATTR, _immediate);
@@ -133,6 +136,11 @@
public void setOnselect(String onselect)
{
_onselect = onselect;
+ }
+
+ public void setReadonly(String readonly)
+ {
+ _readonly = readonly;
}
public void setSize(String size)
Modified: myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/taglib/html/HtmlOutputLabelTagBase.java
URL: http://svn.apache.org/viewvc/myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/taglib/html/HtmlOutputLabelTagBase.java?view=diff&rev=495124&r1=495123&r2=495124
==============================================================================
--- myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/taglib/html/HtmlOutputLabelTagBase.java (original)
+++ myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/taglib/html/HtmlOutputLabelTagBase.java Wed Jan 10 21:25:08 2007
@@ -18,6 +18,7 @@
*/
package org.apache.myfaces.shared.taglib.html;
+import org.apache.myfaces.shared.renderkit.JSFAttr;
import org.apache.myfaces.shared.renderkit.html.HTML;
import javax.faces.component.UIComponent;
@@ -49,13 +50,15 @@
//HTMLOutputLabel attributes
private String _for;
-
+ private String _tabindex;
+
public void release() {
super.release();
_accesskey=null;
_onblur=null;
_onfocus=null;
_for=null;
+ _tabindex=null;
}
protected void setProperties(UIComponent component)
@@ -63,10 +66,11 @@
super.setProperties(component);
setStringProperty(component, HTML.ACCESSKEY_ATTR, _accesskey);
- setStringProperty(component, org.apache.myfaces.shared.renderkit.html.HTML.ONBLUR_ATTR, _onblur);
+ setStringProperty(component, HTML.ONBLUR_ATTR, _onblur);
setStringProperty(component, HTML.ONFOCUS_ATTR, _onfocus);
- setStringProperty(component, org.apache.myfaces.shared.renderkit.JSFAttr.FOR_ATTR, _for);
+ setStringProperty(component, JSFAttr.FOR_ATTR, _for);
+ setStringProperty(component, HTML.TABINDEX_ATTR, _tabindex);
}
public void setAccesskey(String accesskey)
@@ -87,5 +91,10 @@
public void setFor(String aFor)
{
_for = aFor;
+ }
+
+ public void setTabindex(String tabindex)
+ {
+ _tabindex = tabindex;
}
}
Modified: myfaces/tomahawk/trunk/examples/simple/src/test/selenium/TestSuite.html
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/examples/simple/src/test/selenium/TestSuite.html?view=diff&rev=495124&r1=495123&r2=495124
==============================================================================
--- myfaces/tomahawk/trunk/examples/simple/src/test/selenium/TestSuite.html (original)
+++ myfaces/tomahawk/trunk/examples/simple/src/test/selenium/TestSuite.html Wed Jan 10 21:25:08 2007
@@ -32,6 +32,11 @@
</tr>
<tr>
<td>
+ <a href="hOutputLabelTest.html">hOutputLabel</a>
+ </td>
+ </tr>
+ <tr>
+ <td>
<a href="hOutputLinkTest.html">hOutputLink</a>
</td>
</tr>
Modified: myfaces/tomahawk/trunk/examples/simple/src/test/selenium/hCommandButtonTest.html
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/examples/simple/src/test/selenium/hCommandButtonTest.html?view=diff&rev=495124&r1=495123&r2=495124
==============================================================================
--- myfaces/tomahawk/trunk/examples/simple/src/test/selenium/hCommandButtonTest.html (original)
+++ myfaces/tomahawk/trunk/examples/simple/src/test/selenium/hCommandButtonTest.html Wed Jan 10 21:25:08 2007
@@ -45,11 +45,6 @@
</tr>
<tr>
<td>verifyAttribute</td>
- <td>//input[@id='commandButtonForm:commandButtonReadOnly']@readonly</td>
- <td>glob:*</td>
-</tr>
-<tr>
- <td>verifyAttribute</td>
<td>//input[@id='commandButtonForm:commandButtonReset']@type</td>
<td>reset</td>
</tr>
Modified: myfaces/tomahawk/trunk/examples/simple/src/test/selenium/hOutputLabelTest.html
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/examples/simple/src/test/selenium/hOutputLabelTest.html?view=diff&rev=495124&r1=495123&r2=495124
==============================================================================
--- myfaces/tomahawk/trunk/examples/simple/src/test/selenium/hOutputLabelTest.html (original)
+++ myfaces/tomahawk/trunk/examples/simple/src/test/selenium/hOutputLabelTest.html Wed Jan 10 21:25:08 2007
@@ -30,11 +30,6 @@
</tr>
<tr>
<td>verifyAttribute</td>
- <td>//label[@for='outputLabelWithAttributesForm:inputTextB']@tabindex</td>
- <td>2</td>
-</tr>
-<tr>
- <td>verifyAttribute</td>
<td>//label[@for='outputLabelWithAttributesForm:inputTextB']@title</td>
<td>Title</td>
</tr>