diff options
Diffstat (limited to 'app/assets/javascripts')
4 files changed, 5 insertions, 7 deletions
diff --git a/app/assets/javascripts/cakeside.js.coffee b/app/assets/javascripts/cakeside.js.coffee index 57afc2f7..b179d909 100644 --- a/app/assets/javascripts/cakeside.js.coffee +++ b/app/assets/javascripts/cakeside.js.coffee @@ -38,13 +38,10 @@ window.csx = Backbone.history.start() @cakes = new csx.Collections.CakesCollection() - @categories = new csx.Collections.CategoriesCollection() @tutorials = new csx.Collections.TutorialsCollection() csx.Application.reqres.setHandler 'CakesRepository', => @cakes - csx.Application.reqres.setHandler 'CategoriesRepository', => - @categories @photos_cache = {} csx.Application.reqres.setHandler 'PhotosRepository', (cake_id) => if @photos_cache[cake_id] @@ -59,7 +56,6 @@ window.csx = csx.Application.reqres.setHandler 'ProfilesRepository', => @profiles ||= new csx.Collections.ProfilesCollection() - @categories.fetch(reset: true) @tutorials.fetch(reset: true) @cakes.fetch(reset: true).done -> csx.Application.start() diff --git a/app/assets/javascripts/initializers/auto_view_setup.js.coffee b/app/assets/javascripts/initializers/auto_view_setup.js.coffee index 4b72ba67..a3a48586 100644 --- a/app/assets/javascripts/initializers/auto_view_setup.js.coffee +++ b/app/assets/javascripts/initializers/auto_view_setup.js.coffee @@ -7,9 +7,11 @@ class csx.AutoViewSetup extends csx.Behaviour execute: -> for element in $('[data-autoview]') $element = $(element) - @install($element) unless $element.data('autoview-setup-complete') + @install($element) install: (element) -> + return if element.data('autoview-setup-complete') + viewName = element.data('autoview') if viewName.indexOf("-") > 0 csx.AutoView.install(element) diff --git a/app/assets/javascripts/views/my/cakes/edit_view.js.coffee b/app/assets/javascripts/views/my/cakes/edit_view.js.coffee index e4e3192c..64c4da4c 100644 --- a/app/assets/javascripts/views/my/cakes/edit_view.js.coffee +++ b/app/assets/javascripts/views/my/cakes/edit_view.js.coffee @@ -68,7 +68,7 @@ class csx.Views.My.Cakes.EditView extends Marionette.CompositeView serializeData: -> { cake: @model.toJSON(), - categories: csx.Application.request('CategoriesRepository').toJSON(), + categories: csx.Categories.toJSON(), } launchAddPhoto: -> 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 4cfd8815..116d90df 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.Application.request('CategoriesRepository').toJSON(), + categories: csx.Categories.toJSON(), } |