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

Fix comment socketing

Browse source
This commit is contained in:
Raphael Sofaer 2011-07-21 13:21:29 -07:00
parent 4de2ca9958
commit a5fd01cc09
3 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/helpers/sockets_helper.rb
View file

@ -67,10 +67,9 @@ module SocketsHelper
if object.is_a? Comment if object.is_a? Comment
post = object.post post = object.post
action_hash[:comment_id] = object.id action_hash[:comment_guid] = object.guid
action_hash[:my_post?] = (post.author.owner_id == uid) action_hash[:my_post?] = (post.author.owner_id == uid)
action_hash[:post_guid] = post.guid action_hash[:post_guid] = post.guid
end end
if object.is_a? Like if object.is_a? Like

2
app/views/comments/_comments.haml
View file

@ -7,7 +7,7 @@
%li %li
= comment_toggle( post) = comment_toggle( post)
%ul.comments{:id => post.id, :class => ('loaded' if post.comments.size <= 3)} %ul.comments{:class => ('loaded' if post.comments.size <= 3)}
-if post.comments.size > 3 && !comments_expanded -if post.comments.size > 3 && !comments_expanded
= render :partial => 'comments/comment', :collection => post.last_three_comments, :locals => {:post => post} = render :partial => 'comments/comment', :collection => post.last_three_comments, :locals => {:post => post}
-else -else

2
public/javascripts/web-socket-receiver.js
View file

@ -44,7 +44,7 @@ var WebSocketReceiver = {
WebSocketReceiver.processRetraction(obj.post_id); WebSocketReceiver.processRetraction(obj.post_id);
} else if (obj['class']=="comments") { } else if (obj['class']=="comments") {
WebSocketReceiver.processComment(obj.post_id, obj.comment_id, obj.html, { WebSocketReceiver.processComment(obj.post_guid, obj.comment_guid, obj.html, {
'notification': obj.notification, 'notification': obj.notification,
'mine?': obj['mine?'], 'mine?': obj['mine?'],
'my_post?': obj['my_post?'] 'my_post?': obj['my_post?']