summaryrefslogtreecommitdiff
path: root/app/assets/javascripts
diff options
context:
space:
mode:
Diffstat (limited to 'app/assets/javascripts')
-rw-r--r--app/assets/javascripts/cakeside.js.coffee5
-rw-r--r--app/assets/javascripts/controllers/my/tutorials_controller.js.coffee2
-rw-r--r--app/assets/javascripts/views/my/cakes/new_view.js.coffee2
3 files changed, 3 insertions, 6 deletions
diff --git a/app/assets/javascripts/cakeside.js.coffee b/app/assets/javascripts/cakeside.js.coffee
index b179d909..ec405b12 100644
--- a/app/assets/javascripts/cakeside.js.coffee
+++ b/app/assets/javascripts/cakeside.js.coffee
@@ -14,6 +14,7 @@ window.csx =
Routers: {}
Views: {}
Controllers: { My: {} }
+
initialize: (data) ->
$(document).ajaxSend (event, xhr) ->
if data.access_token
@@ -38,7 +39,6 @@ window.csx =
Backbone.history.start()
@cakes = new csx.Collections.CakesCollection()
- @tutorials = new csx.Collections.TutorialsCollection()
csx.Application.reqres.setHandler 'CakesRepository', =>
@cakes
@@ -51,11 +51,8 @@ window.csx =
@photos_cache[cake_id] = photos
photos.fetch(reset: true)
photos
- csx.Application.reqres.setHandler 'TutorialsRepository', =>
- @tutorials
csx.Application.reqres.setHandler 'ProfilesRepository', =>
@profiles ||= new csx.Collections.ProfilesCollection()
- @tutorials.fetch(reset: true)
@cakes.fetch(reset: true).done ->
csx.Application.start()
diff --git a/app/assets/javascripts/controllers/my/tutorials_controller.js.coffee b/app/assets/javascripts/controllers/my/tutorials_controller.js.coffee
index cd30d776..25aef9bd 100644
--- a/app/assets/javascripts/controllers/my/tutorials_controller.js.coffee
+++ b/app/assets/javascripts/controllers/my/tutorials_controller.js.coffee
@@ -2,7 +2,7 @@ class csx.Controllers.My.TutorialsController extends Marionette.Controller
views: csx.Views.My.Tutorials
initialize: (options) ->
@content_region = csx.Application.content_region
- @tutorials = csx.Application.request('TutorialsRepository')
+ @tutorials = csx.Collections.Tutorial
index: ->
@selectTab()
diff --git a/app/assets/javascripts/views/my/cakes/new_view.js.coffee b/app/assets/javascripts/views/my/cakes/new_view.js.coffee
index efc77110..a2e116cd 100644
--- a/app/assets/javascripts/views/my/cakes/new_view.js.coffee
+++ b/app/assets/javascripts/views/my/cakes/new_view.js.coffee
@@ -57,5 +57,5 @@ class csx.Views.My.Cakes.NewView extends Marionette.ItemView
serializeData: ->
{
cake: @model.toJSON(),
- categories: csx.Collection.Category.toJSON(),
+ categories: csx.Collections.Category.toJSON(),
}