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

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

Author: nbelaevski
Date: 2009-01-14 11:12:25 -0500 (Wed, 14 Jan 2009)
New Revision: 12276

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

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-01-14 15:45:00 UTC (rev 12275)
+++ trunk/ui/combobox/src/main/resources/org/richfaces/renderkit/html/scripts/combolist.js	2009-01-14 16:12:25 UTC (rev 12276)
@@ -91,7 +91,7 @@
 				
 		if (this.selectedItem) {
 			//was created new item list, so necessary to recreate selectedItem
-			this.doSelectItem(this.findItemBySubstr(this.selectedItem.innerHTML.unescapeHTML()));
+			this.doSelectItem(this.findItemByDOMNode(this.selectedItem));
 		}
 		
 				
@@ -367,6 +367,11 @@
 		return items;
 	},
 	
+	findItemByDOMNode : function(node) {
+		var substr = node.innerHTML.unescapeHTML(); 
+		return this.findItemBySubstr(substr);
+	},
+	
 	findItemBySubstr : function(substr) {
 		var items = this.getItems();
 		for (var i = 0; i < items.length; i++) {
@@ -381,13 +386,13 @@
 	createNewList : function(items) {
 		//FIX for FF
 		if (this.selectedItem) {
-			var text = this.selectedItem.innerHTML;			
+			var node = this.selectedItem;			
 		}
 		this.list.innerHTML = items.join("");
 		//was created new item list, so necessary to recreate selectedItem
 		
 		if (this.selectedItem) {
-			var item = this.findItemBySubstr(text);
+			var item = this.findItemByDOMNode(node);
 			if (item) {
 				this.doSelectItem(item);
 			}