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

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

Author: pyaschenko
Date: 2009-04-10 10:22:36 -0400 (Fri, 10 Apr 2009)
New Revision: 13495

Modified:
   trunk/ui/combobox/src/main/resources/org/richfaces/renderkit/html/scripts/combobox.js
   trunk/ui/combobox/src/main/resources/org/richfaces/renderkit/html/scripts/combolist.js
   trunk/ui/combobox/src/main/templates/combobox.jspx
Log:
https://jira.jboss.org/jira/browse/RF-5963

Modified: trunk/ui/combobox/src/main/resources/org/richfaces/renderkit/html/scripts/combobox.js
===================================================================
--- trunk/ui/combobox/src/main/resources/org/richfaces/renderkit/html/scripts/combobox.js	2009-04-10 14:03:11 UTC (rev 13494)
+++ trunk/ui/combobox/src/main/resources/org/richfaces/renderkit/html/scripts/combobox.js	2009-04-10 14:22:36 UTC (rev 13495)
@@ -114,7 +114,7 @@
 	},
 	
 	setInputWidth : function() {
-		var width = (parseInt(this.field.parentNode.style.width) - this.BUTTON_WIDTH) + Richfaces.getBorderWidth(this.field, "lr");
+		var width = (parseInt(this.field.parentNode.style.width) - this.BUTTON_WIDTH) - Richfaces.getBorderWidth(this.field, "lr") - Richfaces.getBorderWidth(this.button, "lr") - Richfaces.getPaddingWidth(this.field,"lr");
 		this.field.style.width = width + "px"; 	
 	},
 	

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	2009-04-10 14:03:11 UTC (rev 13494)
+++ trunk/ui/combobox/src/main/resources/org/richfaces/renderkit/html/scripts/combolist.js	2009-04-10 14:22:36 UTC (rev 13495)
@@ -220,7 +220,6 @@
 		var combobox = this.listParent.parentNode;
 		var correction = parseInt(width) - Richfaces.getBorderWidth(positionElem.firstChild, "lr") - Richfaces.getPaddingWidth(positionElem.firstChild, "lr") + "px";
 		this.list.style.width = correction;
-		combobox.style.width = correction;
 		if (this.iframe) {
 			this.iframe.style.width = correction;			
 		}

Modified: trunk/ui/combobox/src/main/templates/combobox.jspx
===================================================================
--- trunk/ui/combobox/src/main/templates/combobox.jspx	2009-04-10 14:03:11 UTC (rev 13494)
+++ trunk/ui/combobox/src/main/templates/combobox.jspx	2009-04-10 14:22:36 UTC (rev 13495)
@@ -204,7 +204,7 @@
     </jsp:scriptlet>
 		<f:resource var="spacer" name="images/spacer.gif"/>
 <div id="#{clientId}">		
-<div id="#{clientId}combobox" class="rich-combobox-font rich-combobox #{styleClass}" style="width:#{listWidth};#{style}"
+<div id="#{clientId}combobox" class="rich-combobox-font rich-combobox #{styleClass}" style="width:#{width};#{style}"
 	 x:passThruWithExclusions="value,name,type,id,styleClass,class,style,size,autocomplete,disabled,onchange">
 
 	<div class="rich-combobox-list-cord"></div>