[richfaces-svn-commits] JBoss Rich Faces SVN: r7697 - branches/3.2.x/ui/combobox/src/main/resources/org/richfaces/renderkit/html/scripts.
Author: abelevich
Date: 2008-04-09 09:02:12 -0400 (Wed, 09 Apr 2008)
New Revision: 7697
Modified:
branches/3.2.x/ui/combobox/src/main/resources/org/richfaces/renderkit/html/scripts/combobox.js
branches/3.2.x/ui/combobox/src/main/resources/org/richfaces/renderkit/html/scripts/combolist.js
Log:
http://jira.jboss.com/jira/browse/RF-2966
Modified:
branches/3.2.x/ui/combobox/src/main/resources/org/richfaces/renderkit/html/scripts/combobox.js
===================================================================
---
branches/3.2.x/ui/combobox/src/main/resources/org/richfaces/renderkit/html/scripts/combobox.js 2008-04-09
12:57:50 UTC (rev 7696)
+++
branches/3.2.x/ui/combobox/src/main/resources/org/richfaces/renderkit/html/scripts/combobox.js 2008-04-09
13:02:12 UTC (rev 7697)
@@ -286,7 +286,7 @@
if (!this.comboList.activeItem) {
return;
}
- var value = this.comboList.activeItem.innerHTML;
+ var value = this.comboList.activeItem.innerHTML.unescapeHTML();
if (toSetOnly) {
var oV = this.field.value;
if (oV == value) {
Modified:
branches/3.2.x/ui/combobox/src/main/resources/org/richfaces/renderkit/html/scripts/combolist.js
===================================================================
---
branches/3.2.x/ui/combobox/src/main/resources/org/richfaces/renderkit/html/scripts/combolist.js 2008-04-09
12:57:50 UTC (rev 7696)
+++
branches/3.2.x/ui/combobox/src/main/resources/org/richfaces/renderkit/html/scripts/combolist.js 2008-04-09
13:02:12 UTC (rev 7697)
@@ -371,7 +371,8 @@
},
createItem : function(text, className) {
- return "<span class=\"" + className+ "\">" + text +
"</span>";
+ var escapedText = text.escapeHTML();
+ return "<span class=\"" + className+ "\">" +
escapedText + "</span>";
},
createIframe : function(parentElem, width, comboboxId, classes) {