Comparing version 1.2.3 to 1.2.4
@@ -28,4 +28,4 @@ if (global.__BonesPlugin__) { | ||
exports.start = function() { | ||
return exports.plugin.start(); | ||
exports.start = function(callback) { | ||
return exports.plugin.start(callback); | ||
}; | ||
@@ -32,0 +32,0 @@ |
{ | ||
"name": "bones", | ||
"version": "1.2.3", | ||
"version": "1.2.4", | ||
@@ -5,0 +5,0 @@ "main": "./bones.js", |
@@ -6,7 +6,7 @@ var Backbone = require('./backbone'); | ||
function Command(plugin) { | ||
function Command(plugin, callback) { | ||
this.options = Object.create(Command.options); | ||
this.bootstrap(plugin, function() { | ||
this.initialize(plugin); | ||
this.initialize(plugin, callback); | ||
}.bind(this)); | ||
@@ -19,3 +19,3 @@ }; | ||
Command.prototype.initialize = function(plugin) {}; | ||
Command.prototype.initialize = function(plugin, callback) {}; | ||
@@ -22,0 +22,0 @@ Command.augment = Backbone.Controller.augment; |
@@ -59,7 +59,5 @@ var Backbone = require('./backbone'); | ||
var context = Object.create(controller, { req: { value: req }, res: { value: res } }); | ||
callback.apply(context, args.concat([ function(content) { | ||
res.send(content); | ||
}])); | ||
callback.apply(context, args); | ||
controller.trigger.apply(controller, ['route:' + name].concat(args)); | ||
}); | ||
}; |
@@ -129,3 +129,3 @@ var path = require('path'); | ||
Plugin.prototype.start = function() { | ||
Plugin.prototype.start = function(callback) { | ||
this.argv = require('optimist').argv; | ||
@@ -139,3 +139,3 @@ | ||
this.loadConfig(command); | ||
return new command(this); | ||
return new command(this, callback); | ||
} | ||
@@ -142,0 +142,0 @@ }; |
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
271708
7839