Changeset 11979

Timestamp:

01/09/08 10:06:50 (12 months ago)

Author:

doughays

Message:

Fixes #5544. Fake dojo.query datastore did not set the store member of the dataObject returned

from fetch and did not work in IE6 at all since innerText returned causing ' textContent'
to be executed which returned undefined.

Files:

• dijit/trunk/form/ComboBox.js (modified) (3 diffs)

dijit/trunk/form/ComboBox.js

@@ -571 +571 @@
                                         deep: true
                                 },
+                                store: this.store,
                                 query: query,
                                 onComplete: dojo.hitch(this, "_openResultList"), 
@@ -997 +998 @@
                                                 /* attribute-name-string */ attribute, 
                                                 /* value? */ defaultValue){
-                return (attribute == "value") ? item.value : (item.innerText || item.textContent);
+                return (attribute == "value") ? item.value : (item.innerText || item.textContent || '');
         },
 
@@ -1022 +1023 @@
                         matcher = new RegExp(query, args.queryOptions.ignoreCase ? "i" : ""),
                         items = dojo.query("> option", this.root).filter(function(option){
-                                return (option.innerText || option.textContent).match(matcher);
+                                return (option.innerText || option.textContent || '').match(matcher);
                         } );