github/backbone
1
1
Fork 0
mirror of https://github.com/jashkenas/backbone.git synced 2026-04-30 03:00:06 -04:00
Code Issues Packages Projects Releases Wiki Activity

Add a test and tweak whitespace for #1448.

Browse Source
This commit is contained in:
Brad Dunbar
2012-06-25 08:33:27 -04:00
parent 6a8232a36e
commit c18b7763f8
2 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
backbone.js
View File

@@ -624,7 +624,6 @@
this.length += length;
index = options.at != null ? options.at : this.models.length;
splice.apply(this.models, [index, 0].concat(models));
// Merge in duplicate models.
if (options.merge) {
@@ -634,7 +633,9 @@
}
}
}
if (this.comparator && options.at == null) this.sort({silent: true});
// Sort the collection if appropriate.
if (this.comparator && options.at == null) this.sort({silent: true});
if (options.silent) return this;
for (i = 0, length = this.models.length; i < length; i++) {

10
test/collection.js
View File

@@ -656,4 +656,14 @@ $(document).ready(function() {
collection.on('add', function(){ ok(true); });
collection.create(model, {wait: true});
});
test("#1448 - add sorts collection after merge.", function() {
var collection = new Backbone.Collection([
{id: 1, x: 1},
{id: 2, x: 2}
]);
collection.comparator = function(model){ return model.get('x'); };
collection.add({id: 1, x: 3}, {merge: true});
deepEqual(collection.pluck('id'), [2, 1]);
});
});