[richfaces-svn-commits] JBoss Rich Faces SVN: r15466 - branches/community/3.3.X/framework/impl/src/main/resources/org/richfaces/renderkit/html/scripts.
Author: Alex.Kolonitsky
Date: 2009-09-04 11:08:24 -0400 (Fri, 04 Sep 2009)
New Revision: 15466
Modified:
branches/community/3.3.X/framework/impl/src/main/resources/org/richfaces/renderkit/html/scripts/utils.js
Log:
comboBox: script error is appeared in ie7 and ie8 if buttonIcon (buttonIconInactive,
buttonIconDisabled) attribute is defined
https://jira.jboss.org/jira/browse/RF-7699
Modified:
branches/community/3.3.X/framework/impl/src/main/resources/org/richfaces/renderkit/html/scripts/utils.js
===================================================================
---
branches/community/3.3.X/framework/impl/src/main/resources/org/richfaces/renderkit/html/scripts/utils.js 2009-09-04
14:38:28 UTC (rev 15465)
+++
branches/community/3.3.X/framework/impl/src/main/resources/org/richfaces/renderkit/html/scripts/utils.js 2009-09-04
15:08:24 UTC (rev 15466)
@@ -8,7 +8,11 @@
if (typeof userStyles[i] == "object") {
this.mergeStyles(userStyles[i],commonStyles[i]);
} else {
- commonStyles[i] += " " + userStyles[i];
+ if (commonStyles[i]) {
+ commonStyles[i] += " " + userStyles[i];
+ } else {
+ commonStyles[i] = userStyles[i];
+ }
}
}
return commonStyles;