Skip to content

Add option to update dropdown menu only after async callback is done #84

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

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
+18 −9
Open

Add option to update dropdown menu only after async callback is done #84

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9a96d82
Add option to refresh suggestion list on DOM only after async callbac…
Jul 27, 2016
ae869f0
ESS-18475 - better initialisation of updateOnAsync variable
Aug 15, 2016
0b9cdb9
ESS-18475 - fix pending- and not found template selection
Aug 15, 2016
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
27 changes: 18 additions & 9 deletions src/typeahead/dataset.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,8 @@ var Dataset = (function() {
// a hint to figuring out of the source will return async suggestions
this.async = _.isUndefined(o.async) ? this.source.length > 2 : !!o.async;

this.updateOnAsync = this.async && o.updateOnAsync === true;

this._resetLastSuggestion();

this.$el = $(o.node)
Expand Down Expand Up @@ -94,12 +96,12 @@ var Dataset = (function() {
}

// no suggestions, expecting async: overwrite dom with pending
else if (this.async && this.templates.pending) {
else if (this.async && !this.updateOnAsync && this.templates.pending) {
this._renderPending(query);
}

// no suggestions, not expecting async: overwrite dom with not found
else if (!this.async && this.templates.notFound) {
else if ((!this.async || this.updateOnAsync) && this.templates.notFound) {
this._renderNotFound(query);
}

Expand Down Expand Up @@ -234,7 +236,7 @@ var Dataset = (function() {
// ### public

update: function update(query) {
var that = this, canceled = false, syncCalled = false, rendered = 0;
var that = this, canceled = false, syncCalled = false, rendered = 0, unrenderedSuggestions = [];

// cancel possible pending update
this.cancel();
Expand All @@ -253,25 +255,32 @@ var Dataset = (function() {

syncCalled = true;
suggestions = (suggestions || []).slice(0, that.limit);
rendered = suggestions.length;

that._overwrite(query, suggestions);
if (!that.updateOnAsync) {
rendered = suggestions.length;
that._overwrite(query, suggestions);
} else
unrenderedSuggestions = suggestions;

if (rendered < that.limit && that.async) {
that.trigger('asyncRequested', query);
}
}

function async(suggestions) {
suggestions = suggestions || [];
suggestions = unrenderedSuggestions.concat(suggestions).slice(0, that.limit - rendered);

// if the update has been canceled or if the query has changed
// do not render the suggestions as they've become outdated
if (!canceled && rendered < that.limit) {
that.cancel = $.noop;
var idx = Math.abs(rendered - that.limit);
rendered += idx;
that._append(query, suggestions.slice(0, idx));

if (!that.updateOnAsync)
that._append(query, suggestions);
else
that._overwrite(query, suggestions);

rendered += suggestions.length;
that.async && that.trigger("asyncReceived", query);
}
}
Expand Down