Permalink
Browse files

Merge pull request #35 from hedgerwang/master

TypeaheadCompositeSource
  • Loading branch information...
rboyce committed Sep 22, 2012
2 parents a875df7 + ae3e962 commit cad107b0a4aefeda7369b72f6aa557ea5c6b8562
Showing with 2 additions and 2 deletions.
  1. +2 −2 src/lib/control/typeahead/source/TypeaheadCompositeSource.js
@@ -45,13 +45,13 @@ JX.install('TypeaheadCompositeSource', {
},
childWaiting : function() {
- if (!this.results.length) {
+ if (!this.results || !this.results.length) {
this.invoke('waiting');
}
},
childResultsReady : function(nodes) {
- this.results = this.mergeResults(this.results, nodes);
+ this.results = this.mergeResults(this.results || [], nodes);
this.invoke('resultsready', this.results);
},

0 comments on commit cad107b

Please sign in to comment.