[Pkg-javascript-commits] [backbone] 164/281: merging in #846

[Jonas Smedegaard]

This is an automated email from the git hooks/post-receive script.

js pushed a commit to tag 0.9.0
in repository backbone.

commit eb868b66c84ed5320371c67c0a72edaea9d986a9
Merge: 2312b90 c8919c4
Author: Jeremy Ashkenas <jashkenas at gmail.com>
Date:   Wed Jan 11 12:28:38 2012 -0500

    merging in #846

 backbone.js        | 19 ++++++++-----------
 test/collection.js |  8 ++++++++
 2 files changed, 16 insertions(+), 11 deletions(-)

diff --cc backbone.js
index ef8aa43,bc6fa0a..6bd30f9
--- a/backbone.js
+++ b/backbone.js
@@@ -568,12 -570,7 +570,7 @@@
        if (already) throw new Error(["Can't add the same model to a set twice", already.id]);
        this._byId[model.id] = model;
        this._byCid[model.cid] = model;
-       if (options.at != null) {
-         this.models.splice(options.at, 0, model);
-       } else {
-         this.models.push(model);
-       }
 -      model.bind('all', this._onModelEvent);
 +      model.bind('all', this._onModelEvent, this);
        this.length++;
        return model;
      },

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-javascript/backbone.git