diff --git a/app/presenters/post_presenter.rb b/app/presenters/post_presenter.rb index 7f5aaae32..e7105caf6 100644 --- a/app/presenters/post_presenter.rb +++ b/app/presenters/post_presenter.rb @@ -9,8 +9,7 @@ class PostPresenter end def to_json(options = {}) - { - :post => self.post.as_api_response(:backbone).update( + self.post.as_api_response(:backbone).update( { :user_like => self.user_like, :user_participation => self.user_participation, @@ -23,10 +22,9 @@ class PostPresenter :likes => self.likes, :reshares => self.reshares, :comments => self.comments, - :participations => self.participations - }), - :templateName => template_name - } + :participations => self.participations, + :templateName => template_name + }) end def comments diff --git a/public/javascripts/app/models/post.js b/public/javascripts/app/models/post.js index 3eb192505..3994b760c 100644 --- a/public/javascripts/app/models/post.js +++ b/public/javascripts/app/models/post.js @@ -40,7 +40,7 @@ app.models.Post = Backbone.Model.extend({ follow : function() { var self = this; this.participations.create({}, {success : function(resp){ - self.set(resp.attributes.post) + self.set(resp) self.trigger('interacted', self) }}); }, @@ -51,7 +51,7 @@ app.models.Post = Backbone.Model.extend({ participationModel.url = this.participations.url + "/" + participationModel.id; participationModel.destroy({success : function(model, resp){ - self.set(resp.post); + self.set(resp); self.trigger('interacted', this) }}); }, @@ -68,7 +68,7 @@ app.models.Post = Backbone.Model.extend({ like : function() { var self = this; this.likes.create({}, {success : function(resp){ - self.set(resp.get("post")) + self.set(resp) self.trigger('interacted', self) }}); @@ -80,7 +80,7 @@ app.models.Post = Backbone.Model.extend({ likeModel.url = this.likes.url + "/" + likeModel.id; likeModel.destroy({success : function(model, resp) { - self.set(resp.post); + self.set(resp); self.trigger('interacted', this) }}); } diff --git a/public/javascripts/app/models/reshare.js b/public/javascripts/app/models/reshare.js index 52674f176..68320eb80 100644 --- a/public/javascripts/app/models/reshare.js +++ b/public/javascripts/app/models/reshare.js @@ -10,9 +10,5 @@ app.models.Reshare = app.models.Post.extend({ reshareAuthor : function(){ return this.rootPost().reshareAuthor() - }, - - parse: function(resp){ - return resp.post } }); diff --git a/public/javascripts/app/pages/post-viewer.js b/public/javascripts/app/pages/post-viewer.js index 7817f6197..a3811365f 100644 --- a/public/javascripts/app/pages/post-viewer.js +++ b/public/javascripts/app/pages/post-viewer.js @@ -21,12 +21,11 @@ app.pages.PostViewer = app.views.Base.extend({ this.authorView = new app.views.PostViewerAuthor({ model : this.model }); this.interactionsView = new app.views.PostViewerInteractions({ model : this.model }); this.navView = new app.views.PostViewerNav({ model : this.model }); - this.postView = new app.views.Post({ model : this.model, - className : this.options.postTemplateName + " post loaded", - templateName : "post-viewer/content/" + this.options.postTemplateName, - attributes : {"data-template" : this.options.postTemplateName} + className : this.model.get("templateName") + " post loaded", + templateName : "post-viewer/content/" + this.model.get("templateName"), + attributes : {"data-template" : this.model.get("templateName")} }); }, diff --git a/public/javascripts/app/router.js b/public/javascripts/app/router.js index ed4c1cd54..235325f7d 100644 --- a/public/javascripts/app/router.js +++ b/public/javascripts/app/router.js @@ -40,11 +40,9 @@ app.Router = Backbone.Router.extend({ singlePost : function(id) { new app.models.Post({id : id}).fetch({success : function(resp){ - var postAttrs = resp.get("post"); var page = new app.pages.PostViewer({ - model : new app.models.Post(postAttrs), - postTemplateName : resp.get("templateName") + model : new app.models.Post(resp) }).render(); $("#container").html(page.el);