diff --git a/app/views/comments/_comment.html.haml b/app/views/comments/_comment.html.haml index 8bb5aba5b5895390ce19ceba635264195abf22c8..54612d7e4db03915614013092f967d338860db0e 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 498963e082be0828a7b2d4b6c987cba7dfb5c3e0..ec9854bb69e29f1d501c2b94b79dd01ae05d25d0 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 1e0f154386d8a9cb4ea17c16d0dc21a7205c4648..9aa2749a5a958db55edd10a58984228548f2e283 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 7240721799e3a6f9f2c57884a70d65efe77e387e..ae6ae7d916619f58a90f1e00270cfd9910e2ba40 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)); });