Commit 2b868b1a authored by Pascal Hartig's avatar Pascal Hartig

Merge pull request #1518 from okiuim/marionette-routing

[backbone_marionette] move backbone.history.start() after controller initialization
parents 4e3769bf 7bfab60a
......@@ -8,13 +8,13 @@ $(function () {
// After we initialize the app, we want to kick off the router
// and controller, which will handle initializing our Views
TodoMVC.App.on('start', function () {
Backbone.history.start();
var controller = new TodoMVC.Controller();
controller.router = new TodoMVC.Router({
controller: controller
});
controller.start();
Backbone.history.start();
});
// start the TodoMVC app (defined in js/TodoMVC.js)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment