Skip to content

Limit and flickering fixup, plus add an option to specify the order of the datasets #6

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
wants to merge 5 commits into from
Closed

Limit and flickering fixup, plus add an option to specify the order of the datasets #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8da8832
Bloodhound optionally indexes/matches remote data
charlotte-miller Mar 26, 2015
af5f471
Make indexing remote a top-level option
Apr 27, 2015
84c5b76
fix invalid limit
Jul 10, 2015
13d5526
Fix flickering of remote-only menu
joekur May 8, 2015
f48e69d
add option to specify an alternative select ordering, list
Jul 13, 2015
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: 19 additions & 3 deletions dist/typeahead.bundle.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1721,7 +1721,9 @@
syncCalled = true;
suggestions = (suggestions || []).slice(0, that.limit);
rendered = suggestions.length;
that._overwrite(query, suggestions);
if (suggestions.length) {
that._overwrite(query, suggestions);
}
if (rendered < that.limit && that.async) {
that.trigger("asyncRequested", query);
}
Expand All @@ -1730,7 +1732,11 @@
suggestions = suggestions || [];
if (!canceled && rendered < that.limit) {
that.cancel = $.noop;
that._append(query, suggestions.slice(0, that.limit - rendered));
if (rendered === 0) {
that._overwrite(query, suggestions.slice(0, that.limit - rendered));
} else {
that._append(query, suggestions.slice(0, that.limit - rendered));
}
rendered += suggestions.length;
that.async && that.trigger("asyncReceived", query);
}
Expand Down Expand Up @@ -1785,6 +1791,7 @@
this.$node = $(o.node);
this.query = null;
this.datasets = _.map(o.datasets, initializeDataset);
this.datasetsSelectOrder = o.datasetsSelectOrder;
function initializeDataset(oDataset) {
var node = that.$node.find(oDataset.node).first();
oDataset.node = node.length ? node : $("<div>").appendTo(that.$node);
Expand Down Expand Up @@ -1813,6 +1820,14 @@
}
},
_getSelectables: function getSelectables() {
if (this.datasetsSelectOrder !== undefined && this.datasetsSelectOrder !== null && Array.isArray && Array.isArray(this.datasetsSelectOrder)) {
var result = [];
for (var i = 0; i < this.datasetsSelectOrder.length; i += 1) {
var selectableSet = this.$node.find(this.selectors.dataset + "-" + this.datasetsSelectOrder[i] + " " + this.selectors.selectable).toArray();
result = result.concat(selectableSet);
}
return $(result);
}
return this.$node.find(this.selectors.selectable);
},
_removeCursor: function _removeCursor() {
Expand Down Expand Up @@ -2278,7 +2293,8 @@
}, www);
menu = new MenuConstructor({
node: $menu,
datasets: datasets
datasets: datasets,
datasetsSelectOrder: o.datasetsSelectOrder
}, www);
typeahead = new Typeahead({
input: input,
Expand Down
4 changes: 2 additions & 2 deletions dist/typeahead.bundle.min.js
View file
Open in desktop

Large diffs are not rendered by default.

22 changes: 19 additions & 3 deletions dist/typeahead.jquery.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -798,7 +798,9 @@
syncCalled = true;
suggestions = (suggestions || []).slice(0, that.limit);
rendered = suggestions.length;
that._overwrite(query, suggestions);
if (suggestions.length) {
that._overwrite(query, suggestions);
}
if (rendered < that.limit && that.async) {
that.trigger("asyncRequested", query);
}
Expand All @@ -807,7 +809,11 @@
suggestions = suggestions || [];
if (!canceled && rendered < that.limit) {
that.cancel = $.noop;
that._append(query, suggestions.slice(0, that.limit - rendered));
if (rendered === 0) {
that._overwrite(query, suggestions.slice(0, that.limit - rendered));
} else {
that._append(query, suggestions.slice(0, that.limit - rendered));
}
rendered += suggestions.length;
that.async && that.trigger("asyncReceived", query);
}
Expand Down Expand Up @@ -862,6 +868,7 @@
this.$node = $(o.node);
this.query = null;
this.datasets = _.map(o.datasets, initializeDataset);
this.datasetsSelectOrder = o.datasetsSelectOrder;
function initializeDataset(oDataset) {
var node = that.$node.find(oDataset.node).first();
oDataset.node = node.length ? node : $("<div>").appendTo(that.$node);
Expand Down Expand Up @@ -890,6 +897,14 @@
}
},
_getSelectables: function getSelectables() {
if (this.datasetsSelectOrder !== undefined && this.datasetsSelectOrder !== null && Array.isArray && Array.isArray(this.datasetsSelectOrder)) {
var result = [];
for (var i = 0; i < this.datasetsSelectOrder.length; i += 1) {
var selectableSet = this.$node.find(this.selectors.dataset + "-" + this.datasetsSelectOrder[i] + " " + this.selectors.selectable).toArray();
result = result.concat(selectableSet);
}
return $(result);
}
return this.$node.find(this.selectors.selectable);
},
_removeCursor: function _removeCursor() {
Expand Down Expand Up @@ -1355,7 +1370,8 @@
}, www);
menu = new MenuConstructor({
node: $menu,
datasets: datasets
datasets: datasets,
datasetsSelectOrder: o.datasetsSelectOrder
}, www);
typeahead = new Typeahead({
input: input,
Expand Down
2 changes: 1 addition & 1 deletion dist/typeahead.jquery.min.js
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 5 additions & 1 deletion doc/bloodhound.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ contain at least `sufficient` number of datums, `remote` data will be requested
and then passed to the `async` callback.

```javascript
bloodhound.search(myQuery, sync, async);
bloodhound.get(myQuery, sync, async);

function sync(datums) {
console.log('datums from `local`, `prefetch`, and `#add`');
Expand Down Expand Up @@ -279,6 +279,10 @@ When configuring `remote`, the following options are available.
you to transform the remote response before the Bloodhound instance operates
on it. Defaults to the [identity function].

* `indexResponse` – Adds the remote response to the index (combined with local
and prefetched data). Then returns filtered results based on the query. Defaults
to `false`.

<!-- section links -->

[identity function]: http://en.wikipedia.org/wiki/Identity_function
13 changes: 10 additions & 3 deletions src/typeahead/dataset.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -255,7 +255,9 @@ var Dataset = (function() {
suggestions = (suggestions || []).slice(0, that.limit);
rendered = suggestions.length;

that._overwrite(query, suggestions);
if (suggestions.length) {
that._overwrite(query, suggestions);
}

if (rendered < that.limit && that.async) {
that.trigger('asyncRequested', query);
Expand All @@ -269,9 +271,14 @@ var Dataset = (function() {
// do not render the suggestions as they've become outdated
if (!canceled && rendered < that.limit) {
that.cancel = $.noop;
that._append(query, suggestions.slice(0, that.limit - rendered));
rendered += suggestions.length;

if (rendered === 0) {
that._overwrite(query, suggestions.slice(0, that.limit - rendered));
} else {
that._append(query, suggestions.slice(0, that.limit - rendered));
}

rendered += suggestions.length;
that.async && that.trigger('asyncReceived', query);
}
}
Expand Down
13 changes: 11 additions & 2 deletions src/typeahead/menu.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ var Menu = (function() {
// the latest query #update was called with
this.query = null;
this.datasets = _.map(o.datasets, initializeDataset);
this.datasetsSelectOrder = o.datasetsSelectOrder;

function initializeDataset(oDataset) {
var node = that.$node.find(oDataset.node).first();
Expand Down Expand Up @@ -69,8 +70,16 @@ var Menu = (function() {
},

_getSelectables: function getSelectables() {
return this.$node.find(this.selectors.selectable);
},
if(this.datasetsSelectOrder !== undefined && this.datasetsSelectOrder !== null && Array.isArray && Array.isArray(this.datasetsSelectOrder) ) {
var result = [];
for(var i = 0; i < this.datasetsSelectOrder.length; i += 1) {
var selectableSet = this.$node.find(this.selectors.dataset + '-'+ this.datasetsSelectOrder[i] + ' ' + this.selectors.selectable).toArray();
result = result.concat(selectableSet);
}
return $(result);
}
return this.$node.find(this.selectors.selectable);
},

_removeCursor: function _removeCursor() {
var $selectable = this.getActiveSelectable();
Expand Down
3 changes: 2 additions & 1 deletion src/typeahead/plugin.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,8 @@
input = new Input({ hint: $hint, input: $input, }, www);
menu = new MenuConstructor({
node: $menu,
datasets: datasets
datasets: datasets,
datasetsSelectOrder: o.datasetsSelectOrder
}, www);

typeahead = new Typeahead({
Expand Down