nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

removed second #stream declaration on status_message#show. fixed bug where show pages would get posts as well as comments.

Browse source
This commit is contained in:
danielvincent 2010-10-24 14:44:24 -07:00
parent 661ad20a02
commit 7b3f6f66c1
4 changed files with 10 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/views/comments/_comment.html.haml
View file

@ -2,7 +2,7 @@
-# licensed under the Affero General Public License version 3 or later. See -# licensed under the Affero General Public License version 3 or later. See
-# the COPYRIGHT file. -# the COPYRIGHT file.
%li.comment{:id => post.id} %li.comment
= person_image_link(post.person) = person_image_link(post.person)
.content .content
.from .from

6
app/views/js/_websocket_js.haml
View file

@ -45,7 +45,7 @@
function processComment(post_id, html){ function processComment(post_id, html){
post = $("*[data-guid='"+post_id+"']'"); post = $("*[data-guid='"+post_id+"']'");
$(' .comments li:last', post ).before( $('.comments li:last', post ).before(
$(html).fadeIn("fast", function(){}) $(html).fadeIn("fast", function(){})
); );
toggler = $('.show_post_comments', post) toggler = $('.show_post_comments', post)
@ -63,9 +63,9 @@
function processPost(className, html, aspectIds){ function processPost(className, html, aspectIds){
if(onPageForAspects(aspectIds)){ if(onPageForAspects(aspectIds)){
var addPostToStream = function (html){ var addPostToStream = function (html){
$("#stream").prepend( $("#stream:not('.show')").prepend(
$(html).fadeIn("fast", function(){ $(html).fadeIn("fast", function(){
$("#stream label:first").inFieldLabels(); $("#stream").find("label").first().inFieldLabels();
}) })
) )
}; };

9
app/views/status_messages/show.html.haml
View file

@ -6,13 +6,10 @@
= render 'shared/author_info', :post => @status_message = render 'shared/author_info', :post => @status_message
.span-14.append-1.last .span-14.append-1.last
#stream %h1.show_text
%h1.show_text = make_links(@status_message.message)
= make_links(@status_message.message)
= "Posted #{how_long_ago(@status_message)} to" = how_long_ago(@status_message)
- for aspect in current_user.aspects_with_post( @status_message.id )
= link_to aspect.name, aspect
- if current_user.owns? @status_message - if current_user.owns? @status_message
%p %p

4
public/javascripts/stream.js
View file

@ -7,7 +7,7 @@
$(document).ready(function(){ $(document).ready(function(){
// expand all comments on page load // expand all comments on page load
$("#stream").find('.comments').each(function(index) { $("#stream:not('.show')").find('.comments').each(function(index) {
var comments = $(this); var comments = $(this);
if(comments.children("li").length > 1) { if(comments.children("li").length > 1) {
var show_comments_toggle = comments.closest("li").find(".show_post_comments"); var show_comments_toggle = comments.closest("li").find(".show_post_comments");
@ -16,7 +16,7 @@ $(document).ready(function(){
}); });
// comment toggle action // 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(); evt.preventDefault();
expandComments($(this)); expandComments($(this));
}); });