$ should be passed into the factory method

seanliang · seanliang · commit a540839bd6a9 · 2014-04-21T23:13:45.000+08:00
diff --git a/backbone/Gruntfile.js b/backbone/Gruntfile.js
@@ -14,15 +14,15 @@ module.exports = function(grunt) {
             'var previousJQuery = this.jQuery;',
             "this._ = require('underscore');",
             "this.jQuery = require('$');",
-            code,
+            code.replace("factory(root, exports, _)", "factory(root, exports, _, jQuery)"),
             "this._ = previousUnderscore;",
             "this.jQuery = previousJQuery;",
             "});"
           ].join('\n');
         }
       },
       src: {
-        url: 'https://raw.github.com/documentcloud/backbone/<%= pkg.version %>/backbone.js',
+        url: 'https://raw.github.com/jashkenas/backbone/<%= pkg.version %>/backbone.js',
         name: 'backbone.js'
       }
     }
diff --git a/backbone/package.json b/backbone/package.json
@@ -6,7 +6,7 @@
   "homepage": "http://backbonejs.org",
   "keywords": ["model", "view", "controller", "router", "server", "client", "browser"],
   "author": "Jeremy Ashkenas <jeremy@documentcloud.org>",
-  "package": "https://raw.github.com/documentcloud/backbone/master/package.json",
+  "package": "https://raw.github.com/jashkenas/backbone/master/package.json",
   "spm": {
     "alias": {
       "$": "$",

Original file line number	Diff line number	Diff line change
`@@ -14,15 +14,15 @@ module.exports = function(grunt) {`
`14`	`14`	`'var previousJQuery = this.jQuery;',`
`15`	`15`	`"this._ = require('underscore');",`
`16`	`16`	`"this.jQuery = require('$');",`
`17`		`- code,`
	`17`	`+ code.replace("factory(root, exports, _)", "factory(root, exports, _, jQuery)"),`
`18`	`18`	`"this._ = previousUnderscore;",`
`19`	`19`	`"this.jQuery = previousJQuery;",`
`20`	`20`	`"});"`
`21`	`21`	`].join('\n');`
`22`	`22`	`}`
`23`	`23`	`},`
`24`	`24`	`src: {`
`25`		`- url: 'https://raw.github.com/documentcloud/backbone/<%= pkg.version %>/backbone.js',`
	`25`	`+ url: 'https://raw.github.com/jashkenas/backbone/<%= pkg.version %>/backbone.js',`
`26`	`26`	`name: 'backbone.js'`
`27`	`27`	`}`
`28`	`28`	`}`