From a5fd01cc0901ed65b1ba9b4781dc48a600e61ebe Mon Sep 17 00:00:00 2001
From: Raphael Sofaer <raphael@joindiaspora.com>
Date: Thu, 21 Jul 2011 13:21:29 -0700
Subject: [PATCH] Fix comment socketing
---
app/helpers/sockets_helper.rb | 3 +--
app/views/comments/_comments.haml | 2 +-
public/javascripts/web-socket-receiver.js | 2 +-
3 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/app/helpers/sockets_helper.rb b/app/helpers/sockets_helper.rb
index b800436796..eaa2465856 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 85254bb518..9a85ea5f38 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 1ae0db45aa..447038c143 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?']
--
GitLab