Author: yradtsevich Date: 2008-11-13 13:54:45 -0500 (Thu, 13 Nov 2008) New Revision: 11772 Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.ajax4jsf/templates/vpe-templates-ajax4jsf.xml trunk/jsf/tests/org.jboss.tools.jsf.vpe.ajax4jsf.test/resources/ajax4jsfTests/WebContent/pages/components/commandButton.xhtml.xml trunk/jsf/tests/org.jboss.tools.jsf.vpe.ajax4jsf.test/resources/ajax4jsfTests/WebContent/pages/components/outputPanel.xhtml.xml trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/toolBar.xhtml.xml Log: RESOLVED - JDIDE-3012 https://jira.jboss.org/jira/browse/JBIDE-3012 - also fixed in a4j:commandButton - tests have been rewritten Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.ajax4jsf/templates/vpe-templates-ajax4jsf.xml =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.ajax4jsf/templates/vpe-templates-ajax4jsf.xml 2008-11-13 18:44:32 UTC (rev 11771) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.ajax4jsf/templates/vpe-templates-ajax4jsf.xml 2008-11-13 18:54:45 UTC (rev 11772) @@ -73,51 +73,107 @@ </vpe:tag> <vpe:tag name="a4j:commandButton" case-sensitive="yes"> - <vpe:if test="not(attrpresent('image'))"> - <vpe:if test="(@type='')"> + <!-- This is a very big if-statement. + Its goal is to add support of 'disabled property' + DO NOT FORGET TO EDIT 'ELSE' PART IN FUTURE MODIFICATIONS --> + <vpe:if test="(@disabled='true')"> + <vpe:if test="not(attrpresent('image'))"> + <vpe:if test="(@type='')"> + <vpe:template children="no" modify="no"> + <input type="button" value="{jsfvalue(@value)}" + class="{@styleClass}" style="{@style}" + title="{tagstring()}" dir="{@dir}" + disabled="disabled"/> + <vpe:resize> + <vpe:width width-attr="style.width" /> + <vpe:height height-attr="style.height" /> + </vpe:resize> + <vpe:dnd> + <vpe:drag start-enable="yes"/> + </vpe:dnd> + <vpe:textFormatting use-default-formats="yes"> + </vpe:textFormatting> + </vpe:template> + </vpe:if> + <vpe:if test="not(@type='')"> + <vpe:template children="no" modify="no"> + <input type="{@type}" value="{jsfvalue(@value)}" + class="{@styleClass}" style="{@style}" + title="{tagstring()}" dir="{@dir}" + disabled="disabled"/> + <vpe:resize> + <vpe:width width-attr="style.width" /> + <vpe:height height-attr="style.height" /> + </vpe:resize> + <vpe:dnd> + <vpe:drag start-enable="yes"/> + </vpe:dnd> + <vpe:textFormatting use-default-formats="yes"> + </vpe:textFormatting> + </vpe:template> + </vpe:if> + </vpe:if> + <vpe:if test="attrpresent('image')"> <vpe:template children="no" modify="no"> - <input type="button" value="{jsfvalue(@value)}" - class="{@styleClass}" style="{@style}" - title="{tagstring()}" dir="{@dir}"/> + <input type="image" src="{src(@image)}" + class="{@styleClass}" style="{@style}" title="{tagstring()}" + disabled="disabled"/> <vpe:resize> <vpe:width width-attr="style.width" /> <vpe:height height-attr="style.height" /> </vpe:resize> - <vpe:dnd> - <vpe:drag start-enable="yes"/> - </vpe:dnd> <vpe:textFormatting use-default-formats="yes"> </vpe:textFormatting> </vpe:template> </vpe:if> - <vpe:if test="not(@type='')"> + </vpe:if> + <!--else--> + <vpe:if test="not(attrpresent('image'))"> + <vpe:if test="(@type='')"> + <vpe:template children="no" modify="no"> + <input type="button" value="{jsfvalue(@value)}" + class="{@styleClass}" style="{@style}" + title="{tagstring()}" dir="{@dir}"/> + <vpe:resize> + <vpe:width width-attr="style.width" /> + <vpe:height height-attr="style.height" /> + </vpe:resize> + <vpe:dnd> + <vpe:drag start-enable="yes"/> + </vpe:dnd> + <vpe:textFormatting use-default-formats="yes"> + </vpe:textFormatting> + </vpe:template> + </vpe:if> + <vpe:if test="not(@type='')"> + <vpe:template children="no" modify="no"> + <input type="{@type}" value="{jsfvalue(@value)}" + class="{@styleClass}" style="{@style}" + title="{tagstring()}" dir="{@dir}"/> + <vpe:resize> + <vpe:width width-attr="style.width" /> + <vpe:height height-attr="style.height" /> + </vpe:resize> + <vpe:dnd> + <vpe:drag start-enable="yes"/> + </vpe:dnd> + <vpe:textFormatting use-default-formats="yes"> + </vpe:textFormatting> + </vpe:template> + </vpe:if> + </vpe:if> + <vpe:if test="attrpresent('image')"> <vpe:template children="no" modify="no"> - <input type="{@type}" value="{jsfvalue(@value)}" - class="{@styleClass}" style="{@style}" - title="{tagstring()}" dir="{@dir}"/> + <input type="image" src="{src(@image)}" class="{@styleClass}" style="{@style}" title="{tagstring()}"/> <vpe:resize> <vpe:width width-attr="style.width" /> <vpe:height height-attr="style.height" /> </vpe:resize> - <vpe:dnd> - <vpe:drag start-enable="yes"/> - </vpe:dnd> <vpe:textFormatting use-default-formats="yes"> </vpe:textFormatting> </vpe:template> </vpe:if> - </vpe:if> - <vpe:if test="attrpresent('image')"> - <vpe:template children="no" modify="no"> - <input type="image" src="{src(@image)}" class="{@styleClass}" style="{@style}" title="{tagstring()}"/> - <vpe:resize> - <vpe:width width-attr="style.width" /> - <vpe:height height-attr="style.height" /> - </vpe:resize> - <vpe:textFormatting use-default-formats="yes"> - </vpe:textFormatting> - </vpe:template> - </vpe:if> + <!--end-of-else--> </vpe:tag> <vpe:tag name="a4j:outputPanel" case-sensitive="yes"> Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.ajax4jsf.test/resources/ajax4jsfTests/WebContent/pages/components/commandButton.xhtml.xml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.ajax4jsf.test/resources/ajax4jsfTests/WebContent/pages/components/commandButton.xhtml.xml 2008-11-13 18:44:32 UTC (rev 11771) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.ajax4jsf.test/resources/ajax4jsfTests/WebContent/pages/components/commandButton.xhtml.xml 2008-11-13 18:54:45 UTC (rev 11772) @@ -1,6 +1,5 @@ <tests> <test id="commandButton"> - <INPUT TYPE="button" VALUE="commandButton" STYLE="-moz-user-modify: read-only;" - READONLY="" /> + <INPUT TYPE="button" VALUE="commandButton" STYLE="-moz-user-modify: read-only;" /> </test> </tests> \ No newline at end of file Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.ajax4jsf.test/resources/ajax4jsfTests/WebContent/pages/components/outputPanel.xhtml.xml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.ajax4jsf.test/resources/ajax4jsfTests/WebContent/pages/components/outputPanel.xhtml.xml 2008-11-13 18:44:32 UTC (rev 11771) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.ajax4jsf.test/resources/ajax4jsfTests/WebContent/pages/components/outputPanel.xhtml.xml 2008-11-13 18:54:45 UTC (rev 11772) @@ -7,7 +7,7 @@ <TD> <DIV> <SPAN> Some text </SPAN> - <INPUT VALUE="#{rsBean.text1}" READONLY=""/> + <INPUT VALUE="#{rsBean.text1}"/> </DIV> </TD> </TR> Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/toolBar.xhtml.xml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/toolBar.xhtml.xml 2008-11-13 18:44:32 UTC (rev 11771) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/toolBar.xhtml.xml 2008-11-13 18:54:45 UTC (rev 11772) @@ -65,11 +65,11 @@ <TBODY> <TR VALIGN="middle"> <TD CLASS="dr-toolbar-int rich-toolbar-item" STYLE=""> - <INPUT CLASS="barsearch" READONLY=""/> + <INPUT CLASS="barsearch"/> </TD> <TD CLASS="dr-toolbar-int rich-toolbar-item" STYLE=""> <INPUT TYPE="button" CLASS="barsearchbutton" VALUE="Search" - STYLE="-moz-user-modify: read-only;" READONLY=""/> + STYLE="-moz-user-modify: read-only;"/> </TD> </TR> </TBODY>