Permalink
Browse files

Merge branch 'master' of github.com:documentcloud/backbone

  • Loading branch information...
jashkenas committed May 2, 2012
2 parents d49c4da + 26a3e2b commit e0d349a5481673126229cba00214bf5e2d517b89
Showing with 3 additions and 3 deletions.
  1. +1 −1 Rakefile
  2. +2 −2 backbone.js
View
@@ -30,7 +30,7 @@ end
desc "test the CoffeeScript integration"
task :test do
- check 'coffee', 'CoffeeScript', 'https://github.com/jashkenas/coffee-script.git'
+ check 'coffee', 'CoffeeScript', 'http://coffeescript.org/'
system "coffee test/*.coffee"
end
View
@@ -809,7 +809,7 @@
// Proxy to _'s chain. Can't be proxied the same way the rest of the
// underscore methods are proxied because it relies on the underscore
// constructor.
- chain: function () {
+ chain: function() {
return _(this.models).chain();
},
@@ -1290,7 +1290,7 @@
});
// The self-propagating extend function that Backbone classes use.
- var extend = function (protoProps, classProps) {
+ var extend = function(protoProps, classProps) {
var child = inherits(this, protoProps, classProps);
child.extend = this.extend;
return child;

0 comments on commit e0d349a

Please sign in to comment.