Skip to content
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

Jump to bottom

Sorted collection: use binary search to insert items #3243

Closed
wants to merge 1 commit into from
Closed

Sorted collection: use binary search to insert items #3243

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
23 changes: 12 additions & 11 deletions backbone.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -688,7 +688,7 @@
if (options.parse) models = this.parse(models, options);
var singular = !_.isArray(models);
models = singular ? (models ? [models] : []) : models.slice();
var id, model, attrs, existing, sort;
var id, model, attrs, existing, sort, simpleSort;
var at = options.at;
var sortable = this.comparator && (at == null) && options.sort !== false;
var sortAttr = _.isString(this.comparator) ? this.comparator : null;
Expand Down Expand Up @@ -739,16 +739,17 @@

// See if sorting is needed, update `length` and splice in new models.
if (toAdd.length || (order && order.length)) {
if (sortable) sort = true;
this.length += toAdd.length;
if (at != null) {
for (var i = 0, length = toAdd.length; i < length; i++) {
this.models.splice(at + i, 0, toAdd[i]);
}
} else {
if (order) this.models.length = 0;
var orderedModels = order || toAdd;
for (var i = 0, length = orderedModels.length; i < length; i++) {
if (order) this.models.length = 0;
simpleSort = !sort && sortable && (this.comparator.length === 1 || _.isString(this.comparator));
sort = sort || (!simpleSort && sortable);
var orderedModels = order || toAdd;
for (var i = 0, length = orderedModels.length; i < length; i++) {
if (simpleSort) {
this.models.splice(_.sortedIndex(this.models, orderedModels[i], this.comparator, this), 0, orderedModels[i]);
} else if (at != null) {
this.models.splice(at + i, 0, orderedModels[i]);
} else {
this.models.push(orderedModels[i]);
}
}
Expand All @@ -762,7 +763,7 @@
for (var i = 0, length = toAdd.length; i < length; i++) {
(model = toAdd[i]).trigger('add', model, this, options);
}
if (sort || (order && order.length)) this.trigger('sort', this, options);
if (sort || simpleSort || (order && order.length)) this.trigger('sort', this, options);
}

// Return the added (or merged) model (or models).
Expand Down
22 changes: 22 additions & 0 deletions test/collection.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -877,6 +877,28 @@
var c = new Backbone.Collection([{id: 1}, {id: 2}, {id: 3}], {
comparator: 'id'
});
c.sort = function(){ throw 'called sort with a value that can be run with _.sortIndex'; };
c.add([]);
c.add({id: 1});
c.add([{id: 2}, {id: 3}]);
c.add({id: 4});

c = new Backbone.Collection([{id: 1}, {id: 2}, {id: 3}], {
comparator: function(model) {
return model.id;
}
});
c.sort = function(){ throw 'called sort with a value that can be run with _.sortIndex'; };
c.add([]);
c.add({id: 1});
c.add([{id: 2}, {id: 3}]);
c.add({id: 4});

c = new Backbone.Collection([{id: 1}, {id: 2}, {id: 3}], {
comparator: function(model1, model2) {
return model1.id - model2.id;
}
});
c.sort = function(){ ok(true); };
c.add([]);
c.add({id: 1});
Expand Down