[jbosstools-commits] JBoss Tools SVN: r42567 - in trunk/jsf: tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components and 1 other directories.
jbosstools-commits at lists.jboss.org
jbosstools-commits at lists.jboss.org
Fri Jul 13 05:55:30 EDT 2012
Author: dmaliarevich
Date: 2012-07-13 05:55:30 -0400 (Fri, 13 Jul 2012)
New Revision: 42567
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/selectitem/AbstractCheckboxSelectItemTemplate.java
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/selectItem.jsp.xml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/selectItems.jsp.xml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/selectManyCheckbox.jsp.xml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/resources/SeamTest/WebContent/pages/components/enumItem.xhtml.xml
Log:
https://issues.jboss.org/browse/JBIDE-8062 - checkboxes were put into DIVs, test pages were corrected.
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/selectitem/AbstractCheckboxSelectItemTemplate.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/selectitem/AbstractCheckboxSelectItemTemplate.java 2012-07-13 00:18:25 UTC (rev 42566)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/selectitem/AbstractCheckboxSelectItemTemplate.java 2012-07-13 09:55:30 UTC (rev 42567)
@@ -28,10 +28,6 @@
abstract public class AbstractCheckboxSelectItemTemplate extends AbstractSelectItemTemplate {
private static final String TYPE_CHECKBOX = "checkbox"; //$NON-NLS-1$
-
- // style of span
- private static final String SPAN_STYLE_VALUE = "-moz-user-modify: read-write;"; //$NON-NLS-1$
-
private String dir;
private String disabled;
private String enabledClass;
@@ -51,38 +47,33 @@
nsIDOMDocument visualDocument) {
readParentAttributes(sourceNode.getParentNode());
-
Element element = (Element) sourceNode;
nsIDOMElement input = visualDocument.createElement(HTML.TAG_INPUT);
nsIDOMElement label = visualDocument.createElement(HTML.TAG_LABEL);
- // create span element
- nsIDOMElement span = visualDocument.createElement(HTML.TAG_SPAN);
+ /*
+ * https://issues.jboss.org/browse/JBIDE-8062
+ * Put into DIV to allow focus in it's itemLabel
+ */
+ nsIDOMElement div = visualDocument.createElement(HTML.TAG_DIV);
+ VpeCreationData creationData = new VpeCreationData(div);
- VpeCreationData creationData = new VpeCreationData(span);
-
- // add title attribute to span
- span.setAttribute(HTML.ATTR_TITLE, getTitle(sourceNode));
- span.setAttribute(HTML.ATTR_STYLE, SPAN_STYLE_VALUE);
-
+ // add title attribute to div
+ div.setAttribute(HTML.ATTR_TITLE, getTitle(sourceNode));
input.setAttribute(HTML.ATTR_TYPE, TYPE_CHECKBOX);
if (attrPresents(dir)) {
input.setAttribute(HTML.ATTR_DIR, dir);
}
-
if (attrPresents(disabled) && Constants.TRUE.equalsIgnoreCase(disabled)) {
label.setAttribute(HTML.ATTR_CLASS, disabledClass);
} else if (attrPresents(enabledClass)) {
label.setAttribute(HTML.ATTR_CLASS, enabledClass);
}
+ div.appendChild(input);
+ div.appendChild(label);
- span.appendChild(input);
- span.appendChild(label);
-
- processOutputAttribute(pageContext, visualDocument, element, label,
- creationData);
-
+ processOutputAttribute(pageContext, visualDocument, element, label, creationData);
return creationData;
}
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/selectItem.jsp.xml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/selectItem.jsp.xml 2012-07-13 00:18:25 UTC (rev 42566)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/selectItem.jsp.xml 2012-07-13 09:55:30 UTC (rev 42567)
@@ -1,10 +1,10 @@
<tests>
<test id="selectItem1">
- <SPAN>
+ <DIV>
<INPUT TYPE="checkbox" />
<LABEL CLASS="myClass1">check1</LABEL>
- </SPAN>
+ </DIV>
</test>
<test id="selectItem2">
<OPTION> value1</OPTION>
@@ -58,9 +58,9 @@
</DIV>
</test>
<test id="selectItem4">
- <SPAN >
+ <DIV>
<INPUT TYPE="checkbox" DIR="ltr" />
<LABEL CLASS="myClass">check1</LABEL>
- </SPAN>
+ </DIV>
</test>
</tests>
\ No newline at end of file
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/selectItems.jsp.xml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/selectItems.jsp.xml 2012-07-13 00:18:25 UTC (rev 42566)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/selectItems.jsp.xml 2012-07-13 09:55:30 UTC (rev 42567)
@@ -1,9 +1,9 @@
<tests>
<test id="selectItems1">
- <SPAN STYLE="-moz-user-modify: read-write;">
+ <DIV>
<INPUT TYPE="checkbox"/>
<LABEL>someValue</LABEL>
- </SPAN>
+ </DIV>
</test>
<test id="selectItems2">
<OPTION>someValue</OPTION>
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/selectManyCheckbox.jsp.xml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/selectManyCheckbox.jsp.xml 2012-07-13 00:18:25 UTC (rev 42566)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/selectManyCheckbox.jsp.xml 2012-07-13 09:55:30 UTC (rev 42567)
@@ -4,26 +4,26 @@
<TABLE>
<TR>
<TD>
- <SPAN STYLE="-moz-user-modify: read-write;">
+ <DIV>
<INPUT TYPE="checkbox" />
<LABEL> check1 </LABEL>
- </SPAN>
+ </DIV>
</TD>
</TR>
<TR>
<TD>
- <SPAN STYLE="-moz-user-modify: read-write;">
+ <DIV>
<INPUT TYPE="checkbox" />
<LABEL> check2 </LABEL>
- </SPAN>
+ </DIV>
</TD>
</TR>
<TR>
<TD>
- <SPAN STYLE="-moz-user-modify: read-write;">
+ <DIV>
<INPUT TYPE="checkbox" />
<LABEL>check3</LABEL>
- </SPAN>
+ </DIV>
</TD>
</TR>
</TABLE>
@@ -34,25 +34,25 @@
<TABLE BORDER="2" STYLE="color: red;" CLASS="myClass">
<TR>
<TD>
- <SPAN STYLE="-moz-user-modify: read-write;">
+ <DIV>
<INPUT TYPE="checkbox" />
<LABEL>check1</LABEL>
- </SPAN>
+ </DIV>
</TD>
<TD>
- <SPAN STYLE="-moz-user-modify: read-write;">
+ <DIV>
<INPUT TYPE="checkbox" />
<LABEL>check2</LABEL>
- </SPAN>
+ </DIV>
</TD>
<TD>
- <SPAN STYLE="-moz-user-modify: read-write;">
+ <DIV>
<INPUT TYPE="checkbox" />
<LABEL>check3</LABEL>
- </SPAN>
+ </DIV>
</TD>
</TR>
</TABLE>
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/resources/SeamTest/WebContent/pages/components/enumItem.xhtml.xml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/resources/SeamTest/WebContent/pages/components/enumItem.xhtml.xml 2012-07-13 00:18:25 UTC (rev 42566)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/resources/SeamTest/WebContent/pages/components/enumItem.xhtml.xml 2012-07-13 09:55:30 UTC (rev 42567)
@@ -1,6 +1,6 @@
<tests>
<test id="id1">
- <DIV STYLE="-moz-user-modify: read-write;">
+ <DIV>
<INPUT TYPE="radio" NAME="radio_name_394"/>
<LABEL>
Only Once
@@ -13,11 +13,11 @@
</OPTION>
</test>
<test id="id3">
- <SPAN STYLE="-moz-user-modify: read-write;">
+ <DIV>
<INPUT TYPE="checkbox" />
<LABEL>
Only Once
</LABEL>
- </SPAN>
+ </DIV>
</test>
</tests>
\ No newline at end of file
More information about the jbosstools-commits
mailing list