[richfaces-svn-commits] JBoss Rich Faces SVN: r5293 - in trunk/sandbox/ui/combobox/src/main: templates and 1 other directory.
richfaces-svn-commits at lists.jboss.org
richfaces-svn-commits at lists.jboss.org
Fri Jan 11 06:14:04 EST 2008
Author: abelevich
Date: 2008-01-11 06:14:04 -0500 (Fri, 11 Jan 2008)
New Revision: 5293
Modified:
trunk/sandbox/ui/combobox/src/main/resources/org/richfaces/renderkit/html/css/combobox.xcss
trunk/sandbox/ui/combobox/src/main/templates/combobox.jspx
Log:
add disabled attr, apply default css styles on startup
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-11 10:34:26 UTC (rev 5292)
+++ trunk/sandbox/ui/combobox/src/main/resources/org/richfaces/renderkit/html/css/combobox.xcss 2008-01-11 11:14:04 UTC (rev 5293)
@@ -116,6 +116,15 @@
border : 1px solid;
}
+.rich-combobox-button-disabled {
+ position : absolute;
+ top : 0px;
+ right : 0px; //left: fullWidth - 17px;
+ width : 17px;
+ margin : 0px;
+ border : 1px solid;
+}
+
.rich-combobox-button-hovered {
position : absolute;
top : 0px;
@@ -177,6 +186,12 @@
<u:style name="border-color" skin="panelBorderColor"/>
</u:selector>
+ <u:selector name=".rich-combobox-button-disabled">
+ <u:style name="border-color" skin="panelBorderColor"/>
+ </u:selector>
+
+
+
<u:selector name=".rich-combobox-button-hovered">
<u:style name="border-color" skin="selectControlColor"/>
</u:selector>
Modified: trunk/sandbox/ui/combobox/src/main/templates/combobox.jspx
===================================================================
--- trunk/sandbox/ui/combobox/src/main/templates/combobox.jspx 2008-01-11 10:34:26 UTC (rev 5292)
+++ trunk/sandbox/ui/combobox/src/main/templates/combobox.jspx 2008-01-11 11:14:04 UTC (rev 5293)
@@ -131,11 +131,11 @@
</jsp:scriptlet>
<div id="#{clientId}" class="rich-combobox-font rich-combobox-shell #{styleClass}" style="width:#{listWidth}; #{style}">
- <input id="comboboxField#{clientId}" name="comboboxField#{clientId}" class="rich-combobox-font rich-combobox-input-default rich-combobox-input #{inputClass}" type="text" value="#{value}" size="#{inputSize}" autocomplete="off" style="width:#{listWidth}; #{inputStyle}">
+ <input id="comboboxField#{clientId}" name="comboboxField#{clientId}" disabled="#{disabled}" class="rich-combobox-font-disabled rich-combobox-input-default-disabled rich-combobox-input-disabled #{inputDisabledClass}" type="text" value="#{value}" size="#{inputSize}" autocomplete="off" style="width:#{listWidth}; #{inputStyle}">
</input>
<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="" style="#{buttonStyle}" class="rich-combobox-font rich-combobox-button-icon rich-combobox-button #{buttonClass}"
+ <input id="comboboxButton#{clientId}" readonly="true" disabled="#{disabled}" type="text" value="" style="#{buttonStyle}" class="rich-combobox-font-disabled rich-combobox-button-icon-disabled rich-combobox-button #{buttonDisabledClass}"
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'"
onmouseout="this.className='rich-combobox-font rich-combobox-button-icon rich-combobox-button'"
@@ -154,9 +154,9 @@
<script type="text/javascript">
Richfaces.ComboBox.CLASSES = {
BUTTON : {CLASSES :
- {NORMAL : "rich-combobox-font-disabled rich-combobox-button-icon-disabled rich-combobox-button #{buttonDisabledClass}",
+ {NORMAL : "rich-combobox-font-disabled rich-combobox-button-icon-disabled rich-combobox-button-disabled #{buttonDisabledClass}",
ACTIVE : "rich-combobox-font rich-combobox-button-icon rich-combobox-button #{buttonClass}",
- DISABLED : "rich-combobox-font-disabled rich-combobox-button-icon-disabled rich-combobox-button #{buttonDisabledClass}"},
+ DISABLED : "rich-combobox-font-disabled rich-combobox-button-icon-disabled rich-combobox-button-disabled #{buttonDisabledClass}"},
STYLE :
{NORMAL: #{buttonDisabledStyle},
ACTIVE: #{buttonStyle},
More information about the richfaces-svn-commits
mailing list