From e5036862f6d6a72ee6e643582f34048e8011fc1e Mon Sep 17 00:00:00 2001
From: ilya <ilya@laptop.(none)>
Date: Tue, 17 Aug 2010 16:49:58 -0700
Subject: [PATCH] DG IZ removed the latest message javascript as well as the
 hash

---
 app/helpers/sockets_helper.rb   |  6 +++---
 app/models/status_message.rb    |  3 ---
 app/views/js/_websocket_js.haml | 14 +++-----------
 3 files changed, 6 insertions(+), 17 deletions(-)

diff --git a/app/helpers/sockets_helper.rb b/app/helpers/sockets_helper.rb
index 9fa8f2f74..e3824b86d 100644
--- a/app/helpers/sockets_helper.rb
+++ b/app/helpers/sockets_helper.rb
@@ -17,9 +17,9 @@ module SocketsHelper
     
     if object.is_a? Photo
       action_hash[:photo_hash] = object.thumb_hash
-    elsif object.is_a? StatusMessage
-      action_hash[:status_message_hash] = object.latest_hash
-      action_hash[:status_message_hash][:mine?] = true if object.person.owner_id == uid
+    end
+    if object.person.owner_id == uid
+      acton_hash[:mine?] == true
     end
 
     action_hash.to_json
diff --git a/app/models/status_message.rb b/app/models/status_message.rb
index 3fb9aa39d..3df72f6ba 100644
--- a/app/models/status_message.rb
+++ b/app/models/status_message.rb
@@ -21,8 +21,5 @@ class StatusMessage < Post
         XML
   end
   
-  def latest_hash
-    { :text => message}
-  end
 end
 
diff --git a/app/views/js/_websocket_js.haml b/app/views/js/_websocket_js.haml
index c458fe43e..57f628073 100644
--- a/app/views/js/_websocket_js.haml
+++ b/app/views/js/_websocket_js.haml
@@ -22,10 +22,10 @@
         
         }else if (obj['class']=='photos' && onPageForClass('albums')){
           processPhotoInAlbum(obj['photo_hash'])
-        }else if (obj['class']=='status_messages'){
-          processStatusMessage(obj['class'], obj['html'], obj['status_message_hash'], obj['group_id'])
         }else{
-          processPost(obj['class'], obj['html'], obj['group_id'])
+          if( (obj['mine?'] == true)|| (onPageForClass(obj['class']) || onPageForGroup(obj['group_id'])) ){
+            processPost(obj['class'], obj['html'])
+          }
         }
 
         
@@ -62,14 +62,6 @@
         }
       }
 
-      function processStatusMessage(className, html, messageHash, groupId){
-        processPost(className, html, groupId);
-        console.log(messageHash)
-        if(messageHash['mine?']){
-          updateMyLatestStatus(messageHash);
-        }
-      }
-      
       function updateMyLatestStatus(messageHash){
         $("#latest_message").text(messageHash['text']);
         $("#latest_message_time").text(' - just now');