[richfaces-svn-commits] JBoss Rich Faces SVN: r11666 - trunk/ui/combobox/src/main/resources/org/richfaces/renderkit/html/scripts.

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

Author: dmorozov
Date: 2008-12-09 11:28:04 -0500 (Tue, 09 Dec 2008)
New Revision: 11666

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

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	2008-12-09 15:18:48 UTC (rev 11665)
+++ trunk/ui/combobox/src/main/resources/org/richfaces/renderkit/html/scripts/combobox.js	2008-12-09 16:28:04 UTC (rev 11666)
@@ -101,28 +101,50 @@
 	buttonMouseUpHandler : function(e) {
 		this.buttonBG.className = "rich-combobox-font rich-combobox-button-background rich-combobox-button";
 		this.button.className = this.classes.button.classes.active + " rich-combobox-button-hovered";
+		
+		var styleCss = this.classes.button.style;
+		if(styleCss && !styleCss.active.blank()) {
+			Element.setStyle(this.button,styleCss.active);
+		}
+		
 		this.field.focus();	
 	},
 	
 	buttonMousedownHandler : function(e) {
 		this.buttonBG.className = "rich-combobox-font rich-combobox-button-pressed-background rich-combobox-button";
 		this.button.className = this.classes.button.classes.active + " rich-combobox-button-hovered";
+		
+		var styleCss = this.classes.button.style;
+		if(styleCss && !styleCss.active.blank()) {
+			Element.setStyle(this.button,styleCss.active);
+		}
+		
 		this.comboList.isList = true;
 	},
 	
 	buttonMouseOverHandler : function(e) {
 		var classCss = this.classes.button.classes;
 		var iconStyles = this.classes.buttonicon.style;
-		
+		var styleCss = this.classes.button.style;
 		if (this.isActive()) { 
 			this.button.className= classCss.active + " " + classCss.hovered;
-			if (!iconStyles.active.blank()) {
+			
+			if(styleCss && !styleCss.active.blank()) {
+				Element.setStyle(this.button,styleCss.active);
+			}
+			
+			if (iconStyles && !iconStyles.active.blank()) {
 				Element.setStyle(this.button,{backgroundImage : iconStyles.active});
 			}	
 		
 		} else {
 			this.button.className = classCss.normal + " " + classCss.hovered;
-			if (!iconStyles.normal.blank()) {
+			
+			if(styleCss && !styleCss.normal.blank()) {
+				Element.setStyle(this.button,styleCss.normal);
+			}	
+			
+			if (iconStyles && !iconStyles.normal.blank()) {
 				Element.setStyle(this.button,{backgroundImage : iconStyles.normal});
 			}	
 		}
@@ -130,16 +152,27 @@
 	
 	buttonMouseOutHandler : function(e) {
 		var classCss = this.classes.button.classes;
+		var styleCss = this.classes.button.style;
 		var iconStyles = this.classes.buttonicon.style;
 		
 		if (this.isActive()) { 
 			this.button.className= classCss.active;
-			if (!iconStyles.active.blank()) {
-								Element.setStyle(this.button,{backgroundImage : iconStyles.active});
+			
+			if(styleCss && !styleCss.active.blank()) {
+				Element.setStyle(this.button,styleCss.active);
+			}
+			
+			if (iconStyles && !iconStyles.active.blank()) {
+				Element.setStyle(this.button,{backgroundImage : iconStyles.active});
 			}	
 		} else {
 			this.button.className = classCss.normal;
-			if (!iconStyles.normal.blank()) {
+			
+			if(styleCss && !styleCss.normal.blank()) {
+				Element.setStyle(this.button,styleCss.normal);
+			}	
+			
+			if (iconStyles && !iconStyles.normal.blank()) {
 				Element.setStyle(this.button,{backgroundImage : iconStyles.normal});
 			}	
 		}
@@ -359,8 +392,13 @@
 		this.field.className = this.classes.field.classes.disabled;
 		Element.setStyle(this.field, this.classes.field.style.disabled);
 		
+		var styleCss =  this.classes.button.style;
+		if(styleCss && !styleCss.disabled.blank()) {
+			Element.setStyle(this.button, styleCss.disabled);
+		}	
+		
 		var iconStyles = this.classes.buttonicon.style;
-		if(!iconStyles.disabled.blank()) {
+		if(iconStyles && !iconStyles.disabled.blank()) {
 			Element.setStyle(this.button,{backgroundImage : iconStyles.disabled});
 		}	
 	
@@ -381,6 +419,11 @@
 		if(!iconStyles.normal.blank()) {
 			Element.setStyle(this.button,{backgroundImage : iconStyles.normal});
 		}	
+		
+		var styleCss =  this.classes.button.style;
+		if(styleCss && !styleCss.normal.blank()) {
+			Element.setStyle(this.button, styleCss.normal);
+		}
 						
 		this.button.disabled = false;
 		this.field.disabled = false;