Author: abelevich Date: 2008-03-24 13:37:33 -0400 (Mon, 24 Mar 2008) New Revision: 7134 Modified: trunk/ui/combobox/src/main/resources/org/richfaces/renderkit/html/css/combobox.xcss trunk/ui/combobox/src/main/resources/org/richfaces/renderkit/html/scripts/combolist.js Log: resolve default component skinning conflicts, iframe positioning fix Modified: trunk/ui/combobox/src/main/resources/org/richfaces/renderkit/html/css/combobox.xcss =================================================================== --- trunk/ui/combobox/src/main/resources/org/richfaces/renderkit/html/css/combobox.xcss 2008-03-24 17:36:29 UTC (rev 7133) +++ trunk/ui/combobox/src/main/resources/org/richfaces/renderkit/html/css/combobox.xcss 2008-03-24 17:37:33 UTC (rev 7134) @@ -12,7 +12,7 @@ input.rich-combobox-button-pressed-background { } -.rich-combobox-input { +input.rich-combobox-input { width : 240px; position : absolute; top : 0px; @@ -27,7 +27,7 @@ background-repeat:repeat-x; } -.rich-combobox-input-disabled { +input.rich-combobox-input-disabled { width : 240px; position : absolute; top : 0px; @@ -42,7 +42,7 @@ background-repeat:repeat-x; } -.rich-combobox-input-inactive { +input.rich-combobox-input-inactive { width : 240px; position : absolute; top : 0px; @@ -57,10 +57,10 @@ background-repeat:repeat-x; } -.rich-combobox-font-disabled { +input.rich-combobox-font-disabled { color: #AAAAAA; +} -} .rich-combobox-list-position { position : absolute; top:1px; @@ -307,23 +307,41 @@ <u:style name="border-left-color" skin="panelBorderColor"/> </u:selector> + <u:selector name="input.rich-combobox-font"> + <u:style name="font-size" skin="generalSizeFont"/> + <u:style name="font-family" skin="generalFamilyFont"/> + <u:style name="color" skin="generalTextColor"/> + </u:selector> + <u:selector name=".rich-combobox-font"> <u:style name="font-size" skin="generalSizeFont"/> <u:style name="font-family" skin="generalFamilyFont"/> <u:style name="color" skin="generalTextColor"/> </u:selector> + <u:selector name="input.rich-combobox-font-disabled"> + <u:style name="font-family" skin="headerFamilyFont"/> + <u:style name="font-size" skin="headerSizeFont"/> + </u:selector> + <u:selector name=".rich-combobox-font-disabled"> <u:style name="font-family" skin="headerFamilyFont"/> <u:style name="font-size" skin="headerSizeFont"/> </u:selector> + <u:selector name="input.rich-combobox-font-inactive"> + <u:style name="font-size" skin="generalSizeFont"/> + <u:style name="font-family" skin="generalFamilyFont"/> + <u:style name="color" skin="generalTextColor"/> + </u:selector> + <u:selector name=".rich-combobox-font-inactive"> <u:style name="font-size" skin="generalSizeFont"/> <u:style name="font-family" skin="generalFamilyFont"/> <u:style name="color" skin="generalTextColor"/> </u:selector> + <u:selector name=".rich-combobox-input"> <u:style name="background-color" skin="controlBackgroundColor"/> <u:style name="border-bottom-color" skin="panelBorderColor"/> Modified: trunk/ui/combobox/src/main/resources/org/richfaces/renderkit/html/scripts/combolist.js =================================================================== --- trunk/ui/combobox/src/main/resources/org/richfaces/renderkit/html/scripts/combolist.js 2008-03-24 17:36:29 UTC (rev 7133) +++ trunk/ui/combobox/src/main/resources/org/richfaces/renderkit/html/scripts/combolist.js 2008-03-24 17:37:33 UTC (rev 7134) @@ -235,12 +235,15 @@ //var top = 0 ;//= -4; var top = fieldHeight; + var topIframe = comBottom; + if (parseInt(listHeight) > (docHeight - comBottom)) { if (fieldTop > (docHeight - comBottom)) { top = 0 - parseInt(listHeight); + topIframe = top; //var upPos = true; } - } + } this.listParent.style.top = top + "px"; this.listParent.style.left = 0 + "px"; @@ -249,7 +252,7 @@ top = Richfaces.ComboBoxList.getElemXY(this.listParent).top + this.fieldDimensions.height; }*/ if (this.iframe) { - this.iframe.style.top = top + "px"; + this.iframe.style.top = topIframe + "px"; this.iframe.style.left = 0 + "px"; } }, @@ -401,7 +404,7 @@ // iframe.style.backgroundColor="#FFFFFF"; iframe.style.width = width; - iframe.style.zIndex = "2"; +// iframe.style.zIndex = "2"; iframe.className = classes;