Skip to content

Added 'compute' value to the Dataset, along with corresponding unit tests #220

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
brianmhunt wants to merge 3 commits into from
Closed

Added 'compute' value to the Dataset, along with corresponding unit tests #220

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
98fa4a7
Added 'compute' value to the Dataset, along with corresponding unit t…
brianmhunt Apr 28, 2013
d37ae3b
fix a comment and error message regarding computed suggestions
brianmhunt Apr 28, 2013
58eb431
compiled typeahead in dist/
brianmhunt Apr 29, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 18 additions & 4 deletions dist/typeahead.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -376,8 +376,8 @@
if (utils.isString(o.template) && !o.engine) {
$.error("no template engine specified");
}
if (!o.local && !o.prefetch && !o.remote) {
$.error("one of local, prefetch, or remote is required");
if (!o.local && !o.prefetch && !o.remote && !o.computed) {
$.error("one of local, prefetch, computed or remote is required");
}
this.name = o.name || utils.getUniqueId();
this.limit = o.limit || 5;
Expand All @@ -389,6 +389,7 @@
this.local = o.local;
this.prefetch = o.prefetch;
this.remote = o.remote;
this.computed = o.computed;
this.itemHash = {};
this.adjacencyList = {};
this.storage = o.name ? new PersistentStorage(o.name) : null;
Expand Down Expand Up @@ -524,11 +525,24 @@
}
terms = utils.tokenizeQuery(query);
suggestions = this._getLocalSuggestions(terms).slice(0, this.limit);
if (suggestions.length < this.limit && this.computed) {
if (this.computed.length == 1) {
utils.each(this.computed(query), function(i, datum) {
suggestions.push(that._transformDatum(datum));
return suggestions.length < that.limit;
});
} else if (this.computed.length == 2) {
this.computed(query, processAsyncData);
return;
} else {
$.error("the computed function must accept one or two arguments");
}
}
if (suggestions.length < this.limit && this.transport) {
cacheHit = this.transport.get(query, processRemoteData);
cacheHit = this.transport.get(query, processAsyncData);
}
!cacheHit && cb && cb(suggestions);
function processRemoteData(data) {
function processAsyncData(data) {
suggestions = suggestions.slice(0);
utils.each(data, function(i, datum) {
var item = that._transformDatum(datum), isDuplicate;
Expand Down
Loading