[Pkg-javascript-commits] [backbone] 169/211: merging in #336.

[Jonas Smedegaard]

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

js pushed a commit to tag 0.5.0
in repository backbone.

commit fb8da91e3e44e95df416e5ecee5926549bfe0abb
Author: Jeremy Ashkenas <jashkenas at gmail.com>
Date:   Thu May 26 15:49:16 2011 -0400

    merging in #336.
---
 backbone.js | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/backbone.js b/backbone.js
index c2e5618..e88c829 100644
--- a/backbone.js
+++ b/backbone.js
@@ -563,13 +563,12 @@
         var attrs = model;
         model = new this.model(null, {collection: this});
         if (!model.set(attrs, options)) model = false;
-      }
-      else if (!model.collection) {
+      } else if (!model.collection) {
         model.collection = this;
       }
       return model;
     },
-    
+
     // Internal implementation of adding a single model to the set, updating
     // hash indexes for `id` and `cid` lookups.
     // Returns the model, or 'false' if validation on a new model fails.

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