Merge pull request #578 from ryno1234/master

Populating Backbone.$ with jquery for CommonJS requires

Author: ErikEvenson

Gruntfile.js

@@ -50,7 +50,9 @@ module.exports = function (grunt) {
             '    });\n' +
             '  } else if (typeof exports === "object") {\n' +
             '    // CommonJS\n' +
-            '    module.exports = factory(require("underscore"), require("backbone"));\n' +
+            '    var Backbone = require("backbone");\n' +
+            '    Backbone.$ = Backbone.$ || require("jquery");\n' +
+            '    module.exports = factory(require("underscore"), Backbone);\n' +
             '  } else {\n' +
             '    // Browser\n' +
             '    root.Backgrid = factory(root._, root.Backbone);\n' +

lib/backgrid.js

@@ -2,7 +2,7 @@
   backgrid 0.3.5
   http://github.com/wyuenho/backgrid
 
-  Copyright (c) 2014 Jimmy Yuen Ho Wong and contributors <wyuenho@gmail.com>
+  Copyright (c) 2015 Jimmy Yuen Ho Wong and contributors <wyuenho@gmail.com>
   Licensed under the MIT license.
 */
 
@@ -15,7 +15,9 @@
     });
   } else if (typeof exports === "object") {
     // CommonJS
-    module.exports = factory(require("underscore"), require("backbone"));
+    var Backbone = require("backbone");
+    Backbone.$ = Backbone.$ || require("jquery");
+    module.exports = factory(require("underscore"), Backbone);
   } else {
     // Browser
     root.Backgrid = factory(root._, root.Backbone);

package.json

@@ -33,5 +33,10 @@
   "engines": {
     "node": ">=0.10"
   },
-  "private": true
+  "private": true,
+  "dependencies": {
+    "backbone": "^1.1.2",
+    "jquery": "^2.1.4",
+    "underscore": "^1.8.3"
+  }
 }