Author: vmolotkov Date: 2008-01-10 13:55:59 -0500 (Thu, 10 Jan 2008) New Revision: 5279 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/scripts/combobox.js trunk/sandbox/ui/combobox/src/main/templates/combobox.jspx Log: new component's attributes 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-10 18:45:48 UTC (rev 5278) +++ trunk/sandbox/ui/combobox/src/main/resources/org/richfaces/renderkit/html/css/combobox.xcss 2008-01-10 18:55:59 UTC (rev 5279) @@ -63,7 +63,7 @@ } .rich-combobox-list-position { - position : absolute; + /*position : absolute;*/ } .rich-combobox-list-decoration { @@ -77,6 +77,7 @@ .rich-combobox-list-cord { position : relative; + z-index:1000; } .rich-combobox-item { 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-10 18:45:48 UTC (rev 5278) +++ trunk/sandbox/ui/combobox/src/main/resources/org/richfaces/renderkit/html/scripts/combobox.js 2008-01-10 18:55:59 UTC (rev 5279) @@ -513,9 +513,4 @@ Richfaces.ComboBox.SPECIAL_KEYS = [ Event.KEY_RETURN, Event.KEY_UP, Event.KEY_DOWN, Event.KEY_RIGHT, Event.KEY_LEFT -] - -Richfaces.ComboBoxList.CLASSES = { - ITEM : {NORMAL : "rich-combobox-item rich-combobox-item-normal", SELECTED : "rich-combobox-item rich-combobox-item-selected"}, - LIST : {} -} \ No newline at end of file +] \ No newline at end of file Modified: trunk/sandbox/ui/combobox/src/main/templates/combobox.jspx =================================================================== --- trunk/sandbox/ui/combobox/src/main/templates/combobox.jspx 2008-01-10 18:45:48 UTC (rev 5278) +++ trunk/sandbox/ui/combobox/src/main/templates/combobox.jspx 2008-01-10 18:55:59 UTC (rev 5279) @@ -60,6 +60,12 @@ Object inputClass = component.getAttributes().get("inputClass"); variables.setVariable("inputClass", inputClass); + Object inputDisabledStyle = component.getAttributes().get("inputDisabledStyle"); + variables.setVariable("inputDisabledStyle", inputDisabledStyle); + + Object inputDisabledClass = component.getAttributes().get("inputDisabledClass"); + variables.setVariable("inputDisabledClass", inputDisabledClass); + Object buttonStyle = component.getAttributes().get("buttonStyle"); variables.setVariable("buttonStyle", buttonStyle); @@ -73,11 +79,17 @@ variables.setVariable("buttonClass", buttonClass); Object listStyle = component.getAttributes().get("listStyle"); - variables.setVariable("buttonStyle", buttonStyle); + variables.setVariable("listStyle", listStyle); Object listClass = component.getAttributes().get("listClass"); variables.setVariable("listClass", listClass); + Object listDisabledStyle = component.getAttributes().get("listDisabledStyle"); + variables.setVariable("listDisabledStyle", listDisabledStyle); + + Object listDisabledClass = component.getAttributes().get("listDisabledClass"); + variables.setVariable("listDisabledClass", listDisabledClass); + Object styleClass = component.getAttributes().get("styleClass"); variables.setVariable("styleClass", styleClass); @@ -107,12 +119,24 @@ <script type="text/javascript"> + Richfaces.ComboBox.CLASSES = { + BUTTON : {NORMAL : "#{buttonDisabledClass}", ACTIVE : "#{buttonClass}", DISABLED : "#{buttonDisabledClass}"}, + FIELD : {NORMAL : "#{inputDisabledClass}", ACTIVE : "#{inputClass}", DISABLED : "#{inputDisabledClass}"}, + COMBO_LIST : { + LIST : {ACTIVE : "#{listClass}", DISABLED : "#{listDisabledClass}"}, + ITEM : {NORMAL : "rich-combobox-item rich-combobox-item-normal", + SELECTED : "rich-combobox-item rich-combobox-item-selected", + DISABLED : "rich-combobox-item rich-combobox-item-disabled", + SELECTED_DISABLED : "rich-combobox-item rich-combobox-item-selected rich-combobox-item-disabled" + } + } + } var combobox = new Richfaces.ComboBox( "#{clientId}", "list#{clientId}", "listParent#{clientId}", "comboboxField#{clientId}", - "comboboxButton#{clientId}", Richfaces.ComboBoxList.CLASSES, + "comboboxButton#{clientId}", Richfaces.ComboBox.CLASSES, "#{listWidth}", "#{listHeight}", #{this:getItemsTextAsJSArray(context, component)}, #{directInputSuggestions},