summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/backbone
diff options
context:
space:
mode:
authormo khan <mo@mokhan.ca>2014-07-05 23:12:20 -0600
committermo khan <mo@mokhan.ca>2014-07-05 23:12:20 -0600
commitd2c496cc2b67cdf65779d79892649db5a7301d36 (patch)
treea5157a9739423d5154100d5ebfb9087ff0677edc /app/assets/javascripts/backbone
parente8788db6985d944445027dd4a686ff8d49e2c742 (diff)
pass controller to constructor of router.
Diffstat (limited to 'app/assets/javascripts/backbone')
-rw-r--r--app/assets/javascripts/backbone/cakeside.js.coffee6
-rw-r--r--app/assets/javascripts/backbone/routers/cakes_router.js.coffee1
-rw-r--r--app/assets/javascripts/backbone/routers/photos_router.js.coffee1
3 files changed, 4 insertions, 4 deletions
diff --git a/app/assets/javascripts/backbone/cakeside.js.coffee b/app/assets/javascripts/backbone/cakeside.js.coffee
index 353b01b5..3de029c5 100644
--- a/app/assets/javascripts/backbone/cakeside.js.coffee
+++ b/app/assets/javascripts/backbone/cakeside.js.coffee
@@ -22,8 +22,10 @@ window.CakeSide =
comment_region: '#disqus_thread'
CakeSide.Application.addInitializer (options) ->
- new CakeSide.Routers.CakesRouter()
- new CakeSide.Routers.PhotosRouter()
+ new CakeSide.Routers.CakesRouter
+ controller: new CakeSide.Controllers.CakesController()
+ new CakeSide.Routers.PhotosRouter
+ controller: new CakeSide.Controllers.PhotosController()
CakeSide.Application.on 'start', ->
if Backbone.history
diff --git a/app/assets/javascripts/backbone/routers/cakes_router.js.coffee b/app/assets/javascripts/backbone/routers/cakes_router.js.coffee
index b72b52b6..95901c0e 100644
--- a/app/assets/javascripts/backbone/routers/cakes_router.js.coffee
+++ b/app/assets/javascripts/backbone/routers/cakes_router.js.coffee
@@ -1,5 +1,4 @@
class CakeSide.Routers.CakesRouter extends Marionette.AppRouter
- controller: new CakeSide.Controllers.CakesController()
appRoutes:
"cakes/new": "newCake"
"cakes/:id/edit": "edit"
diff --git a/app/assets/javascripts/backbone/routers/photos_router.js.coffee b/app/assets/javascripts/backbone/routers/photos_router.js.coffee
index c2823ba6..753f86ba 100644
--- a/app/assets/javascripts/backbone/routers/photos_router.js.coffee
+++ b/app/assets/javascripts/backbone/routers/photos_router.js.coffee
@@ -1,4 +1,3 @@
class CakeSide.Routers.PhotosRouter extends Marionette.AppRouter
- controller: new CakeSide.Controllers.PhotosController()
appRoutes:
"cakes/:cake_id/photos/:id": "show"