You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lo...@apache.org on 2012/02/28 08:03:39 UTC
svn commit: r1294488 -
/myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/webapp/tc/selectBooleanCheckbox/selectBooleanCheckbox.xhtml
Author: lofwyr
Date: Tue Feb 28 07:03:39 2012
New Revision: 1294488
URL: http://svn.apache.org/viewvc?rev=1294488&view=rev
Log:
TOBAGO-1041: tx:selectBooleanCheckbox label is rendered twice - as label and itemLabel
- check the labels content
Modified:
myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/webapp/tc/selectBooleanCheckbox/selectBooleanCheckbox.xhtml
Modified: myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/webapp/tc/selectBooleanCheckbox/selectBooleanCheckbox.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/webapp/tc/selectBooleanCheckbox/selectBooleanCheckbox.xhtml?rev=1294488&r1=1294487&r2=1294488&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/webapp/tc/selectBooleanCheckbox/selectBooleanCheckbox.xhtml (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/webapp/tc/selectBooleanCheckbox/selectBooleanCheckbox.xhtml Tue Feb 28 07:03:39 2012
@@ -22,59 +22,112 @@
xmlns:ui="http://java.sun.com/jsf/facelets"
xmlns:f="http://java.sun.com/jsf/core">
- <tc:page>
+ <tc:page id="page">
<tc:gridLayoutConstraint width="700px" height="600px"/>
<f:facet name="layout">
<!-- fixme: rows="20px" -->
- <tc:gridLayout columns="*;*;2*" rows="auto;20px" columnSpacing="30px"/>
+ <tc:gridLayout columns="*;2*;2*" rows="auto;20px" columnSpacing="30px"/>
</f:facet>
<tc:messages>
<tc:gridLayoutConstraint columnSpan="3"/>
</tc:messages>
-
+
<tc:label value="tc"/>
<tc:label value="tx"/>
- <tc:label value="tx with itemLabel"/>
-
- <tc:selectBooleanCheckbox value="true" label="normal"/>
- <tx:selectBooleanCheckbox value="true" label="normal"/>
- <tx:selectBooleanCheckbox value="true" label="normal" itemLabel="item label"/>
-
- <tc:selectBooleanCheckbox value="false" label="readonly" readonly="true"/>
- <tx:selectBooleanCheckbox value="false" label="readonly" readonly="true"/>
- <tx:selectBooleanCheckbox value="false" label="readonly" readonly="true" itemLabel="item label"/>
-
- <tc:selectBooleanCheckbox value="true" label="disabled" disabled="true"/>
- <tx:selectBooleanCheckbox value="true" label="disabled" disabled="true"/>
- <tx:selectBooleanCheckbox value="true" label="disabled" disabled="true" itemLabel="item label"/>
-
- <tc:selectBooleanCheckbox value="false" label="tip" tip="tip"/>
- <tx:selectBooleanCheckbox value="false" label="tip" tip="tip"/>
- <tx:selectBooleanCheckbox value="false" label="tip" tip="tip" itemLabel="item label"/>
-
- <tc:selectBooleanCheckbox value="true" label="escape <hr/>"/>
- <tx:selectBooleanCheckbox value="true" label="escape <hr/>"/>
- <tx:selectBooleanCheckbox value="true" label="escape <hr/>" itemLabel="escape <hr/>"/>
-
- <tc:selectBooleanCheckbox value="#{selectBooleanCheckboxBean.value0}" label="edit"/>
- <tx:selectBooleanCheckbox value="#{selectBooleanCheckboxBean.value1}" label="edit"/>
- <tx:selectBooleanCheckbox value="#{selectBooleanCheckboxBean.value2}" label="edit" itemLabel="edit"/>
-
- <tc:selectBooleanCheckbox label="required" required="true"/>
- <tx:selectBooleanCheckbox label="required" required="true"/>
- <tx:selectBooleanCheckbox label="required" required="true" itemLabel="required"/>
-
- <tc:selectBooleanCheckbox value="#{selectBooleanCheckboxBean.required0}" label="required/edit" required="true"/>
- <tx:selectBooleanCheckbox value="#{selectBooleanCheckboxBean.required1}" label="required/edit" required="true"/>
- <tx:selectBooleanCheckbox value="#{selectBooleanCheckboxBean.required2}" label="required/edit" required="true"
- itemLabel="required"/>
-
- <tc:selectBooleanCheckbox />
- <tx:selectBooleanCheckbox />
- <tx:selectBooleanCheckbox />
+ <tc:label value="tx with item label"/>
+
+ <tc:selectBooleanCheckbox id="n1" value="true" label="normal"/>
+ <tx:selectBooleanCheckbox id="n2" value="true" label="normal"/>
+ <tx:selectBooleanCheckbox id="n3" value="true" label="normal" itemLabel="item label"/>
+
+ <tc:selectBooleanCheckbox id="r1" value="false" label="readonly" readonly="true"/>
+ <tx:selectBooleanCheckbox id="r2" value="false" label="readonly" readonly="true"/>
+ <tx:selectBooleanCheckbox id="r3" value="false" label="readonly" readonly="true" itemLabel="item label"/>
+
+ <tc:selectBooleanCheckbox id="d1" value="true" label="disabled" disabled="true"/>
+ <tx:selectBooleanCheckbox id="d2" value="true" label="disabled" disabled="true"/>
+ <tx:selectBooleanCheckbox id="d3" value="true" label="disabled" disabled="true" itemLabel="item label"/>
+
+ <tc:selectBooleanCheckbox id="t1" value="false" label="tip" tip="tip"/>
+ <tx:selectBooleanCheckbox id="t2" value="false" label="tip" tip="tip"/>
+ <tx:selectBooleanCheckbox id="t3" value="false" label="tip" tip="tip" itemLabel="item label"/>
+
+ <tc:selectBooleanCheckbox id="e1" value="true" label="escape <hr/>"/>
+ <tx:selectBooleanCheckbox id="e2" value="true" label="escape <hr/>"/>
+ <tx:selectBooleanCheckbox id="e3" value="true" label="escape <hr/>" itemLabel="item label <hr/>"/>
+
+ <tc:selectBooleanCheckbox id="i1" value="#{selectBooleanCheckboxBean.value0}" label="edit"/>
+ <tx:selectBooleanCheckbox id="i2" value="#{selectBooleanCheckboxBean.value1}" label="edit"/>
+ <tx:selectBooleanCheckbox id="i3" value="#{selectBooleanCheckboxBean.value2}" label="edit" itemLabel="item label"/>
+
+ <tc:selectBooleanCheckbox id="q1" label="required" required="true"/>
+ <tx:selectBooleanCheckbox id="q2" label="required" required="true"/>
+ <tx:selectBooleanCheckbox id="q3" label="required" required="true" itemLabel="item label"/>
+
+ <tc:selectBooleanCheckbox id="b1" value="#{selectBooleanCheckboxBean.required0}" label="required/edit"
+ required="true"/>
+ <tx:selectBooleanCheckbox id="b2" value="#{selectBooleanCheckboxBean.required1}" label="required/edit"
+ required="true"/>
+ <tx:selectBooleanCheckbox id="b3" value="#{selectBooleanCheckboxBean.required2}" label="required/edit"
+ required="true" itemLabel="item label"/>
+
+ <tc:selectBooleanCheckbox id="x1"/>
+ <tx:selectBooleanCheckbox id="x2"/>
+ <tx:selectBooleanCheckbox id="x3"/>
<tc:button label="submit"/>
-
+
+ <tc:script file="script/tobago-assert.js">
+
+ function checkTcItemLabel(id, value) {
+ TobagoAssert.assertContent(
+ jQuery(Tobago.Utils.escapeClientId(id)).next('label'), value);
+ }
+
+ function checkTxItemLabelEmpty(id) {
+ TobagoAssert.assertContent(
+ jQuery(Tobago.Utils.escapeClientId(id)).children('div').children('label'), '');
+ }
+
+ function checkTxItemLabel(id, value) {
+ TobagoAssert.assertContent(
+ jQuery(Tobago.Utils.escapeClientId(id)).children('div').children('label'), value);
+ }
+
+ </tc:script>
+
+ <tc:script onload="checkTcItemLabel('page:n1', 'normal');"/>
+ <tc:script onload="checkTcItemLabel('page:r1', 'readonly');"/>
+ <tc:script onload="checkTcItemLabel('page:d1', 'disabled');"/>
+ <tc:script onload="checkTcItemLabel('page:t1', 'tip');"/>
+ <tc:script onload="checkTcItemLabel('page:e1', 'escape &lt;hr/&gt;');"/>
+ <tc:script onload="checkTcItemLabel('page:i1', 'edit');"/>
+ <tc:script onload="checkTcItemLabel('page:q1', 'required');"/>
+ <tc:script onload="checkTcItemLabel('page:b1', 'required/edit');"/>
+ <tc:script onload="checkTcItemLabel('page:x1', undefined);"/>
+
+ <!-- All tx tags without item label shouldn't have an item label rendered -->
+ <tc:script onload="checkTxItemLabelEmpty('page:n2');"/>
+ <tc:script onload="checkTxItemLabelEmpty('page:r2');"/>
+ <tc:script onload="checkTxItemLabelEmpty('page:d2');"/>
+ <tc:script onload="checkTxItemLabelEmpty('page:t2');"/>
+ <tc:script onload="checkTxItemLabelEmpty('page:e2');"/>
+ <tc:script onload="checkTxItemLabelEmpty('page:i2');"/>
+ <tc:script onload="checkTxItemLabelEmpty('page:q2');"/>
+ <tc:script onload="checkTxItemLabelEmpty('page:b2');"/>
+ <tc:script onload="checkTxItemLabelEmpty('page:x2');"/>
+
+ <tc:script onload="checkTxItemLabel('page:n3', 'item label');"/>
+ <tc:script onload="checkTxItemLabel('page:r3', 'item label');"/>
+ <tc:script onload="checkTxItemLabel('page:d3', 'item label');"/>
+ <tc:script onload="checkTxItemLabel('page:t3', 'item label');"/>
+ <tc:script onload="checkTxItemLabel('page:e3', 'item label &lt;hr/&gt;');"/>
+ <tc:script onload="checkTxItemLabel('page:i3', 'item label');"/>
+ <tc:script onload="checkTxItemLabel('page:q3', 'item label');"/>
+ <tc:script onload="checkTxItemLabel('page:b3', 'item label');"/>
+ <tc:script onload="checkTxItemLabel('page:x3', '');"/>
+
+
</tc:page>
</f:view>