Ticket #4417: 4417.patch

form/ComboBox.js

@@ -513 +513 @@
                         if(!this._popupWidget){
                                 var popupId = this.id + "_popup";
                                 this._popupWidget = new dijit.form._ComboBoxMenu({
+                                        store: this.store,
                                         onChange: dojo.hitch(this, this._selectOption),
                                         id:popupId
                                 });
@@ -780 +781 @@
                         dojo.forEach(results, function(item, i){
                                 var menuitem = this._createOption(item, labelFunc);
                                 menuitem.className = "dijitReset dijitMenuItem";
-                                dojo.attr(menuitem, "id", this.id + i);
+                                dojo.attr(menuitem, "id", this.store.getValue(item, "id") || (this.id + i));
                                 this.domNode.insertBefore(menuitem, this.nextButton);
                         }, this);
                         // display "Next . . ." button
@@ -1059 +1060 @@
         getValue: function(     /* item */ item, 
                                                 /* attribute-name-string */ attribute, 
                                                 /* value? */ defaultValue){
-                return (attribute == "value") ? item.value : (item.innerText || item.textContent || '');
+                return (attribute == "id")? item.id  : ((attribute == "value") ? item.value : (item.innerText || item.textContent || ''));
         },
 
         isItemLoaded: function(/* anything */ something) {