diff --git a/app/views/comments/_comment.html.haml b/app/views/comments/_comment.html.haml
index 8bb5aba5b..54612d7e4 100644
--- a/app/views/comments/_comment.html.haml
+++ b/app/views/comments/_comment.html.haml
@@ -2,7 +2,7 @@
-# licensed under the Affero General Public License version 3 or later. See
-# the COPYRIGHT file.
-%li.comment{:id => post.id}
+%li.comment
= person_image_link(post.person)
.content
.from
diff --git a/app/views/js/_websocket_js.haml b/app/views/js/_websocket_js.haml
index 498963e08..ec9854bb6 100644
--- a/app/views/js/_websocket_js.haml
+++ b/app/views/js/_websocket_js.haml
@@ -45,7 +45,7 @@
function processComment(post_id, html){
post = $("*[data-guid='"+post_id+"']'");
- $(' .comments li:last', post ).before(
+ $('.comments li:last', post ).before(
$(html).fadeIn("fast", function(){})
);
toggler = $('.show_post_comments', post)
@@ -63,9 +63,9 @@
function processPost(className, html, aspectIds){
if(onPageForAspects(aspectIds)){
var addPostToStream = function (html){
- $("#stream").prepend(
+ $("#stream:not('.show')").prepend(
$(html).fadeIn("fast", function(){
- $("#stream label:first").inFieldLabels();
+ $("#stream").find("label").first().inFieldLabels();
})
)
};
diff --git a/app/views/status_messages/show.html.haml b/app/views/status_messages/show.html.haml
index 1e0f15438..9aa2749a5 100644
--- a/app/views/status_messages/show.html.haml
+++ b/app/views/status_messages/show.html.haml
@@ -6,13 +6,10 @@
= render 'shared/author_info', :post => @status_message
.span-14.append-1.last
- #stream
- %h1.show_text
- = make_links(@status_message.message)
+ %h1.show_text
+ = make_links(@status_message.message)
- = "Posted #{how_long_ago(@status_message)} to"
- - for aspect in current_user.aspects_with_post( @status_message.id )
- = link_to aspect.name, aspect
+ = how_long_ago(@status_message)
- if current_user.owns? @status_message
%p
diff --git a/public/javascripts/stream.js b/public/javascripts/stream.js
index 724072179..ae6ae7d91 100644
--- a/public/javascripts/stream.js
+++ b/public/javascripts/stream.js
@@ -5,9 +5,9 @@
$(document).ready(function(){
-
+
// expand all comments on page load
- $("#stream").find('.comments').each(function(index) {
+ $("#stream:not('.show')").find('.comments').each(function(index) {
var comments = $(this);
if(comments.children("li").length > 1) {
var show_comments_toggle = comments.closest("li").find(".show_post_comments");
@@ -16,7 +16,7 @@ $(document).ready(function(){
});
// comment toggle action
- $("#stream").delegate("a.show_post_comments", "click", function(evt) {
+ $("#stream:not('.show')").delegate("a.show_post_comments", "click", function(evt) {
evt.preventDefault();
expandComments($(this));
});