app/views/comments/show.js.rjs @@ -33,7 +33,12 @@ class CommentsController < ApplicationController before_filter :ensure_parent_exists, :only => :create def show - redirect_to "#{post_path(current_object.post)}#comment_#{params[:id]}" + respond_to do |format| + format.html do + redirect_to "#{post_path(current_object.post)}#comment_#{params[:id]}" + end + format.js + end end def index app/controllers/comments_controller.rb @@ -7,6 +7,12 @@ module CommentsHelper :failure => "$('comment_#{@comment.id}_content').update(#{failure_html('Save Failed').to_json})" end + def comment_edit_cancel_action + remote_function :url => object_path + '.js', :method => :get, + :loading => "$('comment_#{@comment.id}_content').spin()", + :failure => "$('comment_#{@comment.id}_content').update(#{failure_html('Failed').to_json})" + end + def atom_title(comment) h((params[:post_id] ? '' : "#{comment.post.title} : ") + truncate(comment.content.gsub(/\s+/, ' '), 50)) app/helpers/comments_helper.rb @@ -4,4 +4,5 @@ = f.hidden_field :user_id = preview_button new_object_path, "comment_#{@comment.id}_preview" = comment_edit_save_button + %input.button{:type => 'button', :value => 'Cancel', :name => 'submit', :onclick => comment_edit_cancel_action} .content{:style => 'display: none', :id => "comment_#{@comment.id}_preview"} app/views/comments/edit.html.haml @@ -263,3 +263,27 @@ describe CommentsController, "#edit" do response.should render_template('edit') end end + +describe CommentsController, '#show' do + include ResourcefulController + include ApplicationSpecHelpers + + before(:each) do + @parent_model = Post + stub_show + + @comment.stubs(:post).returns(@post) + @post.stubs(:to_param).returns(17) + @post.stubs(:slug).returns('foo-bar-baz') + end + + it "should redirect to the post path on an HTML request" do + get :show, :id => 12 + response.should redirect_to('/posts/17-foo-bar-baz#comment_12') + end + + it "should render the comment-updating JS on a JS request" do + get :show, :id => 12, :format => 'js' + response.should render_template('show') + end +end spec/controllers/comments_controller_spec.rb 34ec495b2a47c2da8ec3f74237d50d7d6775be8d Nathan Weizenbaum nex342@gmail.com http://github.com/nex3/nex3-s-blog-engine/commit/589aa4ce34bcd337652dd9d9cb035188ef428461 589aa4ce34bcd337652dd9d9cb035188ef428461 2008-04-29T00:28:37-07:00 2008-04-29T00:28:37-07:00 Add a Cancel button for the comment edit form. db417653ea0a3bd4950ad1509d88140756bbf43c Nathan Weizenbaum nex342@gmail.com