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

Merge pull request #1587 from krawaller/master.

Browse Source 
Conflicts:
	test/collection.js
This commit is contained in:
Brad Dunbar
2012-09-14 07:19:57 -04:00
parent dc960f7933 8f29954011
commit 8fdcaf207a
3 changed files with 56 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
backbone.js
View File

@@ -733,6 +733,12 @@
sort: function(options) {
options || (options = {});
if (!this.comparator) throw new Error('Cannot sort a set without a comparator');
if (typeof this.comparator === "string"){
var attrName = this.comparator;
this.comparator = function(o){
return o.get(attrName);
};
}
var boundComparator = _.bind(this.comparator, this);
if (this.comparator.length === 1) {
this.models = this.sortBy(boundComparator);

65
index.html
View File

@@ -1386,7 +1386,7 @@ var Library = Backbone.Collection.extend({
<br />
When creating a Collection, you may choose to pass in the initial array
of <b>models</b>. The collection's <a href="#Collection-comparator">comparator</a>
function may be included as an option. Passing <tt>false</tt> as the
may be included as an option. Passing <tt>false</tt> as the
comparator option will prevent sorting. If you define an
<b>initialize</b> function, it will be invoked when the collection is
created.
@@ -1590,29 +1590,33 @@ var book = Library.get(110);
<p id="Collection-comparator">
<b class="header">comparator</b><code>collection.comparator</code>
<br />
By default there is no <b>comparator</b> function on a collection.
By default there is no <b>comparator</b> on a collection.
If you define a comparator, it will be used to maintain
the collection in sorted order. This means that as models are added,
they are inserted at the correct index in <tt>collection.models</tt>.
Comparator function can be defined as either a
<a href="http://underscorejs.org/#sortBy">sortBy</a>
(pass a function that takes a single argument),
or as a
<a href="https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/Array/sort">sort</a>
(pass a comparator function that expects two arguments).
</p>
<p>
"sortBy" comparator functions take a model and return a numeric or string
value by which the model should be ordered relative to others.
"sort" comparator functions take two models, and return <tt>-1</tt> if
the first model should come before the second, <tt>0</tt> if they are of
the same rank and <tt>1</tt> if the first model should come after.
Comparators come in three different forms:
</p>
<ul>
<li>
A <a href="http://underscorejs.org/#sortBy">sortBy</a> comparator
is a function that takes a model parameter and returns a numeric or string
value by which the model should be ordered relative to others.
</li>
<li>
A <a href="https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/Array/sort">sort</a>
comparator function takes two models, and return <tt>-1</tt> if the first
model should come before the second, <tt>0</tt> if they are of the same rank
and <tt>1</tt> if the first model should come after.
</li>
<li>
Finally the comparator can also be a <b>string</b> containing the name of the model
attribute we wish to sort by.
</li>
</ul>
<p>
Note how even though all of the chapters in this example are added backwards,
they come out in the proper order:
they come out in the proper order thanks to the comparator:
</p>
<pre class="runnable">
@@ -1630,17 +1634,36 @@ chapters.add(new Chapter({page: 1, title: "The Beginning"}));
alert(chapters.pluck('title'));
</pre>
<p>
As no special computation was done on the model attribute, the previous example also works
with a comparator string naming the desired sorting attribute:
</p>
<pre class="runnable">
var Chapter = Backbone.Model;
var chapters = new Backbone.Collection;
chapters.comparator = "page";
chapters.add(new Chapter({page: 9, title: "The End"}));
chapters.add(new Chapter({page: 5, title: "The Middle"}));
chapters.add(new Chapter({page: 1, title: "The Beginning"}));
alert(chapters.pluck('title'));
</pre>
<p class="warning">
Collections with comparator functions will not automatically re-sort if you
later change model attributes, so you may wish to call <tt>sort</tt> after
changing model attributes that would affect the order.
Collections with a comparator will not automatically re-sort if you
later change model attributes, so you may wish to call
<tt>sort</tt> after changing model attributes that would affect the order.
</p>
<p id="Collection-sort">
<b class="header">sort</b><code>collection.sort([options])</code>
<br />
Force a collection to re-sort itself. You don't need to call this under
normal circumstances, as a collection with a <a href="#Collection-comparator">comparator</a> function
normal circumstances, as a collection with a <a href="#Collection-comparator">comparator</a>
will sort itself whenever a model is added. Calling <b>sort</b>
triggers the collection's <tt>"reset"</tt> event, unless silenced by passing
<tt>{silent: true}</tt>

7
test/collection.js
View File

@@ -18,7 +18,7 @@ $(document).ready(function() {
}));
test("new and sort", 7, function() {
test("new and sort", 9, function() {
equal(col.first(), a, "a should be first");
equal(col.last(), d, "d should be last");
col.comparator = function(a, b) {
@@ -32,6 +32,11 @@ $(document).ready(function() {
equal(col.first(), d, "d should be first");
equal(col.last(), a, "a should be last");
equal(col.length, 4);
// tests with string comparator
col.comparator = "label";
col.sort();
equal(col.first(), a, "a should be first");
equal(col.last(), d, "d should be last");
});
test("new and parse", 3, function() {