From 7c5e3cb4154d24175d621cada59020d3fa043d21 Mon Sep 17 00:00:00 2001 From: danielgrippi Date: Sun, 18 Dec 2011 18:54:52 -0800 Subject: [PATCH] switch like_stream to use backbone --- app/controllers/like_stream_controller.rb | 11 ++++++++++- public/javascripts/app/router.js | 1 + public/javascripts/app/views/stream_view.js | 3 +-- public/stylesheets/sass/application.sass | 2 +- 4 files changed, 13 insertions(+), 4 deletions(-) diff --git a/app/controllers/like_stream_controller.rb b/app/controllers/like_stream_controller.rb index f0434a74e..d79f26198 100644 --- a/app/controllers/like_stream_controller.rb +++ b/app/controllers/like_stream_controller.rb @@ -5,7 +5,16 @@ require File.join(Rails.root, 'lib','stream', 'likes') class LikeStreamController < ApplicationController + + respond_to :html, :json + def index - default_stream_action(Stream::Likes) + @backbone = true + stream_klass = Stream::Likes + + respond_with do |format| + format.html{ default_stream_action(stream_klass) } + format.json{ stream_json(stream_klass) } + end end end diff --git a/public/javascripts/app/router.js b/public/javascripts/app/router.js index de4120990..1b215e347 100644 --- a/public/javascripts/app/router.js +++ b/public/javascripts/app/router.js @@ -2,6 +2,7 @@ App.Router = Backbone.Router.extend({ routes: { "stream": "stream", "comment_stream": "stream", + "like_stream": "stream", "mentions": "stream", "people/:id": "stream", "tag_followings": "stream", diff --git a/public/javascripts/app/views/stream_view.js b/public/javascripts/app/views/stream_view.js index 7217056a8..c7542a4c6 100644 --- a/public/javascripts/app/views/stream_view.js +++ b/public/javascripts/app/views/stream_view.js @@ -24,8 +24,7 @@ App.Views.Stream = Backbone.View.extend({ this.$("#paginate").remove(); $(this.el).append($("", { href: this.collection.url(), - id: "paginate", - "class": "paginate" + id: "paginate" }).text('Load more posts')); }, diff --git a/public/stylesheets/sass/application.sass b/public/stylesheets/sass/application.sass index 143a8e84c..be58b95d5 100644 --- a/public/stylesheets/sass/application.sass +++ b/public/stylesheets/sass/application.sass @@ -791,7 +791,7 @@ form.new_comment h4 :font-weight bold -a.paginate, #infscr-loading +#paginate, #infscr-loading :display block :margin