Author: abelevich Date: 2008-04-09 09:03:47 -0400 (Wed, 09 Apr 2008) New Revision: 7699 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 Log: http://jira.jboss.com/jira/browse/RF-2966 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-04-09 13:02:40 UTC (rev 7698) +++ trunk/ui/combobox/src/main/resources/org/richfaces/renderkit/html/scripts/combobox.js 2008-04-09 13:03:47 UTC (rev 7699) @@ -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: 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 2008-04-09 13:02:40 UTC (rev 7698) +++ trunk/ui/combobox/src/main/resources/org/richfaces/renderkit/html/scripts/combolist.js 2008-04-09 13:03:47 UTC (rev 7699) @@ -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) {