diff --git a/app/helpers/sockets_helper.rb b/app/helpers/sockets_helper.rb index b800436796b78b0a5c373d8bf1dbdf1c55422f15..eaa2465856987b52bdb2c1bdc72e193c6af89082 100644 --- a/app/helpers/sockets_helper.rb +++ b/app/helpers/sockets_helper.rb @@ -67,10 +67,9 @@ module SocketsHelper if object.is_a? Comment 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[:post_guid] = post.guid - end if object.is_a? Like diff --git a/app/views/comments/_comments.haml b/app/views/comments/_comments.haml index 85254bb518bf08afb1b0c37b98d530c26da118af..9a85ea5f3891c7a5818d53554c6908ab8ea04892 100644 --- a/app/views/comments/_comments.haml +++ b/app/views/comments/_comments.haml @@ -7,7 +7,7 @@ %li = 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 = render :partial => 'comments/comment', :collection => post.last_three_comments, :locals => {:post => post} -else diff --git a/public/javascripts/web-socket-receiver.js b/public/javascripts/web-socket-receiver.js index 1ae0db45aa5a2e44644beb417ca52b08f37bc8d1..447038c1438d5e67d8460c9c5759efed1661df2b 100644 --- a/public/javascripts/web-socket-receiver.js +++ b/public/javascripts/web-socket-receiver.js @@ -44,7 +44,7 @@ var WebSocketReceiver = { WebSocketReceiver.processRetraction(obj.post_id); } 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, 'mine?': obj['mine?'], 'my_post?': obj['my_post?']