[richfaces-svn-commits] JBoss Rich Faces SVN: r5239 - in trunk/sandbox/ui/combobox/src/main: resources/org/richfaces/renderkit/html/css and 2 other directories.

Author: abelevich Date: 2008-01-09 14:25:25 -0500 (Wed, 09 Jan 2008) New Revision: 5239 Modified: trunk/sandbox/ui/combobox/src/main/config/component/combobox.xml trunk/sandbox/ui/combobox/src/main/resources/org/richfaces/renderkit/html/css/combobox.xcss trunk/sandbox/ui/combobox/src/main/resources/org/richfaces/renderkit/html/scripts/combobox.js trunk/sandbox/ui/combobox/src/main/templates/combobox.jspx Log: rename classes according spec Modified: trunk/sandbox/ui/combobox/src/main/config/component/combobox.xml =================================================================== --- trunk/sandbox/ui/combobox/src/main/config/component/combobox.xml 2008-01-09 18:31:34 UTC (rev 5238) +++ trunk/sandbox/ui/combobox/src/main/config/component/combobox.xml 2008-01-09 19:25:25 UTC (rev 5239) @@ -208,6 +208,19 @@ <description></description> <defaultvalue><![CDATA[""]]></defaultvalue> </property> + <property> + <name>buttonIcon</name> + <classname>java.lang.String</classname> + <description>uri to the button icon image</description> + <defaultvalue><![CDATA[""]]></defaultvalue> + </property> + <property> + <name>buttonIconDisabled</name> + <classname>java.lang.String</classname> + <description>uri to the disabled button icon image</description> + <defaultvalue><![CDATA[""]]></defaultvalue> + </property> + &html_events; </properties> </component> Modified: trunk/sandbox/ui/combobox/src/main/resources/org/richfaces/renderkit/html/css/combobox.xcss =================================================================== --- trunk/sandbox/ui/combobox/src/main/resources/org/richfaces/renderkit/html/css/combobox.xcss 2008-01-09 18:31:34 UTC (rev 5238) +++ trunk/sandbox/ui/combobox/src/main/resources/org/richfaces/renderkit/html/css/combobox.xcss 2008-01-09 19:25:25 UTC (rev 5239) @@ -6,8 +6,15 @@ <f:verbatim> <![CDATA[ +.rich-combobox-button-pressed { +} +.rich-combobox-button-disabled { +} +.rich-combobox-button-hovered { +} + .rich-combobox-item-normal { } @@ -107,21 +114,21 @@ border : 1px solid; } -.rich-combobox-button-bg { +.rich-combobox-button-background { background : top repeat-x; cursor : pointer; } -.rich-combobox-button-bg-press { +.rich-combobox-button-pressed-background { background : top repeat-x; cursor : pointer; } -.rich-combobox-button-arrow { +.rich-combobox-button-icon { background : center no-repeat; cursor : pointer; } -.rich-combobox-button-arrow-disabled { +.rich-combobox-button-icon-disabled { background : center no-repeat; cursor : pointer; } @@ -129,27 +136,27 @@ </f:verbatim> - <u:selector name=".rich-combobox-button-bg"> + <u:selector name=".rich-combobox-button-background"> <u:style name="background-image"> <f:resource f:key="org.richfaces.renderkit.images.ComboBoxButtonGradient" /> </u:style> <u:style name="background-color" skin="tabBackgroundColor"/> </u:selector> - <u:selector name=".rich-combobox-button-bg-press"> + <u:selector name=".rich-combobox-button-pressed-background"> <u:style name="background-image"> <f:resource f:key="org.richfaces.renderkit.images.ComboBoxButtonPressGradient" /> </u:style> <u:style name="background-color" skin="tabBackgroundColor"/> </u:selector> - <u:selector name=".rich-combobox-button-arrow"> + <u:selector name=".rich-combobox-button-icon"> <u:style name="background-image"> <f:resource f:key="org.richfaces.renderkit.images.ComboBoxArrowImage" /> </u:style> </u:selector> - <u:selector name=".rich-combobox-button-arrow-disabled"> + <u:selector name=".rich-combobox-button-icon-disabled"> <u:style name="background-image"> <f:resource f:key="org.richfaces.renderkit.images.ComboBoxArrowImageDisable" /> </u:style> Modified: trunk/sandbox/ui/combobox/src/main/resources/org/richfaces/renderkit/html/scripts/combobox.js =================================================================== --- trunk/sandbox/ui/combobox/src/main/resources/org/richfaces/renderkit/html/scripts/combobox.js 2008-01-09 18:31:34 UTC (rev 5238) +++ trunk/sandbox/ui/combobox/src/main/resources/org/richfaces/renderkit/html/scripts/combobox.js 2008-01-09 19:25:25 UTC (rev 5239) @@ -166,12 +166,12 @@ }, doActive : function() { - this.button.className = "rich-combobox-button rich-combobox-font rich-combobox-button-arrow"; + this.button.className = "rich-combobox-font rich-combobox-button-icon rich-combobox-button"; this.field.className = "rich-combobox-font rich-combobox-input-default rich-combobox-input"; //FIXME }, doDisable : function() { - this.button.className = "rich-combobox-button rich-combobox-font rich-combobox-button-arrow-disabled"; + this.button.className = "rich-combobox-font rich-combobox-button-icon-disabled rich-combobox-button"; this.field.className = "rich-combobox-font-disabled rich-combobox-input-default-disabled rich-combobox-input-disabled"; //FIXME } }; Modified: trunk/sandbox/ui/combobox/src/main/templates/combobox.jspx =================================================================== --- trunk/sandbox/ui/combobox/src/main/templates/combobox.jspx 2008-01-09 18:31:34 UTC (rev 5238) +++ trunk/sandbox/ui/combobox/src/main/templates/combobox.jspx 2008-01-09 19:25:25 UTC (rev 5239) @@ -54,11 +54,11 @@ <div id="#{clientId}" class="rich-combobox-font rich-combobox-shell" style="width:#{listWidth}"> <input id="comboboxField#{clientId}" class="rich-combobox-font rich-combobox-input-default rich-combobox-input" type="text" size="#{inputSize}" autocomplete="off" style="width:#{listWidth}"> </input> - <input id="comboBoxButtonBG#{clientId}" readonly="true" type="text" value="" class="rich-combobox-button rich-combobox-font rich-combobox-button-bg"> + <input id="comboBoxButtonBG#{clientId}" readonly="true" type="text" value="" class="rich-combobox-font rich-combobox-button-background rich-combobox-button"> </input> - <input id="comboboxButton#{clientId}" readonly="true" type="text" value="" class="rich-combobox-button rich-combobox-font rich-combobox-button-arrow" - onmousedown="document.getElementById('comboBoxButtonBG#{clientId}').className='rich-combobox-button rich-combobox-font rich-combobox-button-bg-press'" - onmouseup="document.getElementById('comboBoxButtonBG#{clientId}').className='rich-combobox-button rich-combobox-font rich-combobox-button-bg'" > + <input id="comboboxButton#{clientId}" readonly="true" type="text" value="" class="rich-combobox-font rich-combobox-button-icon rich-combobox-button " + onmousedown="document.getElementById('comboBoxButtonBG#{clientId}').className='rich-combobox-font rich-combobox-button-pressed-background rich-combobox-button'; this.className='rich-combobox-button rich-combobox-button-pressed rich-combobox-font rich-combobox-button-icon';" + onmouseup="document.getElementById('comboBoxButtonBG#{clientId}').className='rich-combobox-font rich-combobox-button-background rich-combobox-button'; this.className='rich-combobox-button rich-combobox-font rich-combobox-button-icon'" > </input> <input type="text" class="rich-combobox-strut rich-combobox-font" style="width:#{listWidth}"> </input>