[richfaces-svn-commits] JBoss Rich Faces SVN: r5396 - in trunk/sandbox/ui/combobox/src/main: templates and 1 other directory.

[richfaces-svn-commits at lists.jboss.org]

Author: vmolotkov
Date: 2008-01-15 14:37:54 -0500 (Tue, 15 Jan 2008)
New Revision: 5396

Modified:
   trunk/sandbox/ui/combobox/src/main/resources/org/richfaces/renderkit/html/scripts/combobox.js
   trunk/sandbox/ui/combobox/src/main/templates/combobox.jspx
Log:
component's structure is changed

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-15 18:17:56 UTC (rev 5395)
+++ trunk/sandbox/ui/combobox/src/main/resources/org/richfaces/renderkit/html/scripts/combobox.js	2008-01-15 19:37:54 UTC (rev 5396)
@@ -425,6 +425,7 @@
 				}
 			}
 		}
+		this.iframe.show();
 		this.listParent.show();
 		this.listParent.fire("rich:onlistcall", {});
 		
@@ -439,6 +440,7 @@
 	
 	hide : function() {
 		this.resetState();
+		this.iframe.hide();
 		this.listParent.hide();
 	},
 	
@@ -505,6 +507,8 @@
 		} 
 		this.listParent.style.top = top + "px";
 		this.listParent.style.left = 0 + "px";
+		this.iframe.style.top = Richfaces.ComboBoxList.getElemXY(this.listParent).top + this.fieldDimensions.height + "px";
+		this.iframe.style.left = Richfaces.ComboBoxList.getElemXY(this.listParent).left + "px";
 	},
 	
 	scrolling : function(event) {

Modified: trunk/sandbox/ui/combobox/src/main/templates/combobox.jspx
===================================================================
--- trunk/sandbox/ui/combobox/src/main/templates/combobox.jspx	2008-01-15 18:17:56 UTC (rev 5395)
+++ trunk/sandbox/ui/combobox/src/main/templates/combobox.jspx	2008-01-15 19:37:54 UTC (rev 5396)
@@ -193,34 +193,36 @@
          }
 		]]>
 	</jsp:scriptlet>
-	<div id="#{clientId}" class="rich-combobox-font rich-combobox-shell #{styleClass}" style="width:#{listWidth}; z-index:1;#{style}"
-		 x:passThruWithExclusions="value,name,type,id,styleClass,class,style,size,autocomplete,disabled,onchange">
-		<div class="rich-combobox-font rich-combobox-shell" style="width:#{width};z-index:1;">
-			<input id="comboboxField#{clientId}" 
-				   name="comboboxField#{clientId}" 
-				   disabled="#{disabled}" 
-				   class="rich-combobox-font-inactive rich-combobox-input-inactive  #{inputDisabledClass}" type="text" 
-				   value="#{value}" 
-				   size="#{inputSize}" 
-				   autocomplete="off" 
-				   onchange="#{component.attributes['onchange']}"
-				   onselect="#{component.attributes['onselect']}"
-				   onblur="#{component.attributes['onblur']}"
-				   style="width:#{width}; #{inputStyle}"
-				   />
-			<input id="comboBoxButtonBG#{clientId}" readonly="true" type="text" value="" class="rich-combobox-font-inactive rich-combobox-button-background rich-combobox-button-inactive"/>
-			<input id="comboboxButton#{clientId}" readonly="true" disabled="#{disabled}" type="text" value="" style="#{buttonStyle}; background-image: #{buttonIconNormal};" 
-				   class="rich-combobox-font-inactive rich-combobox-button-icon-inactive rich-combobox-button-inactive #{buttonDisabledClass}"/>
-						   
-			<input type="text" class="rich-combobox-strut rich-combobox-font" style="width:#{width}"/>
+	<div id="#{clientId}">
+		<div id="control#{clientId}" class="rich-combobox-font rich-combobox-shell #{styleClass}" style="width:#{listWidth}; z-index:1;#{style}"
+			 x:passThruWithExclusions="value,name,type,id,styleClass,class,style,size,autocomplete,disabled,onchange">
+			<div class="rich-combobox-font rich-combobox-shell" style="width:#{width};z-index:1;">
+				<input id="comboboxField#{clientId}" 
+					   name="comboboxField#{clientId}" 
+					   disabled="#{disabled}" 
+					   class="rich-combobox-font-inactive rich-combobox-input-inactive  #{inputDisabledClass}" type="text" 
+					   value="#{value}" 
+					   size="#{inputSize}" 
+					   autocomplete="off" 
+					   onchange="#{component.attributes['onchange']}"
+					   onselect="#{component.attributes['onselect']}"
+					   onblur="#{component.attributes['onblur']}"
+					   style="width:#{width}; #{inputStyle}"
+					   />
+				<input id="comboBoxButtonBG#{clientId}" readonly="true" type="text" value="" class="rich-combobox-font-inactive rich-combobox-button-background rich-combobox-button-inactive"/>
+				<input id="comboboxButton#{clientId}" readonly="true" disabled="#{disabled}" type="text" value="" style="#{buttonStyle}; background-image: #{buttonIconNormal};" 
+					   class="rich-combobox-font-inactive rich-combobox-button-icon-inactive rich-combobox-button-inactive #{buttonDisabledClass}"/>
+							   
+				<input type="text" class="rich-combobox-strut rich-combobox-font" style="width:#{width}"/>
+			</div>
 		</div>
-	</div>
-	<iframe id="iframe#{clientId}" class="rich-combobox-list-scroll rich-combobox-list-position" frameborder="0" style="width:#{listWidth};z-index:2;background-color:white;"/>
-	<div id="listParent#{clientId}" class="rich-combobox-list-cord #{listClass}" style="display:none; #{listStyle};z-index:3;">
-		<div id="listPosition#{clientId}" class="rich-combobox-list-position" style="width:#{listWidth};">
-			<div id="listDecoration#{clientId}" class="rich-combobox-list-decoration">
-				<div id="list#{clientId}" class="rich-combobox-list-scroll" style="width:#{listWidth};">
-					<f:call name="encodeItems"/>
+		<iframe id="iframe#{clientId}" class="rich-combobox-list-scroll rich-combobox-list-position" frameborder="0" style="display:none; width:#{listWidth};z-index:2;"/>
+		<div id="listParent#{clientId}" class="rich-combobox-list-cord #{listClass}" style="display:none; #{listStyle};z-index:3;">
+			<div id="listPosition#{clientId}" class="rich-combobox-list-position" style="width:#{listWidth};">
+				<div id="listDecoration#{clientId}" class="rich-combobox-list-decoration">
+					<div id="list#{clientId}" class="rich-combobox-list-scroll" style="width:#{listWidth};">
+						<f:call name="encodeItems"/>
+					</div>
 				</div>
 			</div>
 		</div>
@@ -268,7 +270,7 @@
 			}
 		}
 		
-		var combobox = new Richfaces.ComboBox( "#{clientId}", 
+		var combobox = new Richfaces.ComboBox( "control#{clientId}", 
 							   				   "list#{clientId}", 
 							   				   "listParent#{clientId}",
 											   "comboboxField#{clientId}",