diff --git a/bones.js b/bones.js index d5c9fdbd..4cb22a70 100644 --- a/bones.js +++ b/bones.js @@ -15,6 +15,8 @@ exports.middleware = require(path.join(__dirname, 'server/middleware')); exports.server = true; exports.Backbone = require(path.join(__dirname, 'server/backbone')); +exports.Backbone.setDomLibrary(exports.$); + exports.Router = require(path.join(__dirname, 'server/router')); exports.Model = require(path.join(__dirname, 'server/model')); exports.Collection = require(path.join(__dirname, 'server/collection')); diff --git a/client/backbone.js b/client/backbone.js index 08bd58d5..c5fe61b4 100644 --- a/client/backbone.js +++ b/client/backbone.js @@ -1,3 +1,5 @@ +Backbone.setDomLibrary($); + Backbone.Router.prototype.route = function(route, name, callback) { Backbone.history || (Backbone.history = new Backbone.History); if (!_.isRegExp(route)) route = this._routeToRegExp(route); diff --git a/examples/simple/routers/App.bones.js b/examples/simple/routers/App.bones.js index d3dbc0c5..0f96a1fc 100644 --- a/examples/simple/routers/App.bones.js +++ b/examples/simple/routers/App.bones.js @@ -1,8 +1,8 @@ router = Backbone.Router.extend({ routes: { - '/': 'home', - '/about': 'about', - '/project/:project': 'project' + '': 'home', + 'about': 'about', + 'project/:project': 'project' }, // The `home` route... diff --git a/package.json b/package.json index 481d1a31..14f23888 100644 --- a/package.json +++ b/package.json @@ -14,7 +14,7 @@ "dependencies": { "underscore": "~1.3.3", "express": "~2.5.4", - "backbone": "0.5.3", + "backbone": "~0.9.2", "jquery": "~1.6.3", "optimist": "0.3.x", "mirror": "0.3.x" diff --git a/server/router.js b/server/router.js index 3431aa54..e2a80c3b 100644 --- a/server/router.js +++ b/server/router.js @@ -47,7 +47,7 @@ Backbone.Router.prototype._bindRoutes = function() { }; Backbone.Router.prototype.route = function(route, name, callback) { - if (!_.isRegExp(route)) route = this._routeToRegExp(route); + if (!_.isRegExp(route)) route = this._routeToRegExp('/' + route); if (!_.isFunction(callback)) throw new Error("'" + name + "' is not a function in " + this); // Add route to express server. diff --git a/test/fixture/routers/Page.bones.js b/test/fixture/routers/Page.bones.js index 5a2f8006..ce9773db 100644 --- a/test/fixture/routers/Page.bones.js +++ b/test/fixture/routers/Page.bones.js @@ -1,8 +1,8 @@ router = Backbone.Router.extend({ routes: { - '/': 'home', - '/page/:id': 'page', - '/page/special': 'pageSpecial' + '': 'home', + 'page/:id': 'page', + 'page/special': 'pageSpecial' }, page: function(id) {