From 4a9900dff669ed98625e04d306c4f420f93055a5 Mon Sep 17 00:00:00 2001
From: Raphael Sofaer <raphael@joindiaspora.com>
Date: Tue, 5 Jul 2011 18:52:00 -0700
Subject: [PATCH] Fix some ui bugs on the post show page

---
 app/controllers/aspects_controller.rb         |  2 +-
 app/controllers/status_messages_controller.rb |  4 ++++
 app/helpers/stream_helper.rb                  |  4 ++++
 app/views/comments/_comments.haml             | 10 ++++------
 app/views/shared/_stream_element.html.haml    |  2 +-
 public/javascripts/stream.js                  |  4 ++--
 6 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/app/controllers/aspects_controller.rb b/app/controllers/aspects_controller.rb
index c47257a16..690acb010 100644
--- a/app/controllers/aspects_controller.rb
+++ b/app/controllers/aspects_controller.rb
@@ -9,7 +9,7 @@ class AspectsController < ApplicationController
 
   respond_to :html, :js
   respond_to :json, :only => [:show, :create]
-  
+
   helper_method :tags, :tag_followings
   helper_method :all_aspects_selected?
 
diff --git a/app/controllers/status_messages_controller.rb b/app/controllers/status_messages_controller.rb
index 5160411c6..df69ee00a 100644
--- a/app/controllers/status_messages_controller.rb
+++ b/app/controllers/status_messages_controller.rb
@@ -123,4 +123,8 @@ class StatusMessagesController < ApplicationController
     end
   end
 
+  helper_method :comments_expanded
+  def comments_expanded
+    true
+  end
 end
diff --git a/app/helpers/stream_helper.rb b/app/helpers/stream_helper.rb
index 92a31e98d..566a92d54 100644
--- a/app/helpers/stream_helper.rb
+++ b/app/helpers/stream_helper.rb
@@ -24,4 +24,8 @@ module StreamHelper
       post.created_at
     end
   end
+
+  def comments_expanded
+    false
+  end
 end
diff --git a/app/views/comments/_comments.haml b/app/views/comments/_comments.haml
index 52ab8fd0f..a4e155b99 100644
--- a/app/views/comments/_comments.haml
+++ b/app/views/comments/_comments.haml
@@ -2,16 +2,14 @@
 -#   licensed under the Affero General Public License version 3 or later.  See
 -#   the COPYRIGHT file.
 
-- is_expanded = defined?(always_expanded) && always_expanded
-
-- unless is_expanded
-  %ul.show_comments{:class => ("hidden" unless comments.size > 3)}
+- unless comments_expanded
+  %ul.show_comments{:class => ("hidden" if comments.size <= 3)}
     %li
       %b= comment_toggle(comments.size)
 
-%ul.comments{:id => post.id, :class => ("hidden" if comments.size == 0 && !defined?(force_open) && !is_expanded)}
+%ul.comments{:id => post.id, :class => ("hidden" if comments.size == 0 && !comments_expanded)}
   -if comments.size > 3
-    .older_comments{:class => ("hidden inactive" if defined?(condensed) && condensed)}
+    .older_comments{:class => ("hidden inactive" unless comments_expanded)}
       = render :partial => 'comments/comment', :collection => comments[0..-4], :locals => {:post => post}
     = render :partial => 'comments/comment', :collection => comments[-3, 3], :locals => {:post => post}
   -else
diff --git a/app/views/shared/_stream_element.html.haml b/app/views/shared/_stream_element.html.haml
index 4933e2c38..e65d3e039 100644
--- a/app/views/shared/_stream_element.html.haml
+++ b/app/views/shared/_stream_element.html.haml
@@ -59,4 +59,4 @@
         - if post.likes_count > 0
           = render "likes/likes_container", :post_id => post.id, :likes_count => post.likes_count, :current_user => current_user
 
-      = render "comments/comments", :post => post, :comments => post.comments, :current_user => current_user, :condensed => true, :commenting_disabled => (defined?(@commenting_disabled) && @commenting_disabled)
+      = render "comments/comments", :post => post, :comments => post.comments, :current_user => current_user, :commenting_disabled => (defined?(@commenting_disabled) && @commenting_disabled)
diff --git a/public/javascripts/stream.js b/public/javascripts/stream.js
index d4b6718e8..55d03ce99 100644
--- a/public/javascripts/stream.js
+++ b/public/javascripts/stream.js
@@ -29,7 +29,7 @@ var Stream = {
     // collapse long comments
     $(".comment .content span", this.selector).expander({
       slicePoint: 200,
-      widow: 12,
+      widow: 400,
       expandText: Diaspora.widgets.i18n.t("show_more"),
       userCollapse: false
     });
@@ -93,7 +93,7 @@ var Stream = {
             .removeClass("open");
       }
     });
-    
+
   },
 
   setUpAudioLinks: function() {