From fa59be2353a68a0c1bc947e41562eb3453261b8a Mon Sep 17 00:00:00 2001
From: Raphael Sofaer <raphael@joindiaspora.com>
Date: Fri, 8 Apr 2011 16:10:17 -0700
Subject: [PATCH] Another bit of JS cleanup

---
 public/javascripts/aspect-edit.js |  8 ++++----
 public/javascripts/inbox.js       |  6 +++---
 public/javascripts/stream.js      | 33 +++++++++++++++++--------------
 3 files changed, 25 insertions(+), 22 deletions(-)

diff --git a/public/javascripts/aspect-edit.js b/public/javascripts/aspect-edit.js
index f482bca1e..0833d2635 100644
--- a/public/javascripts/aspect-edit.js
+++ b/public/javascripts/aspect-edit.js
@@ -18,9 +18,9 @@ var AspectEdit = {
       drop: AspectEdit.onDropMove
     });
 
-    $("#manage_aspect_zones").find(".delete").live("click", AspectEdit.deletePerson);
-    $(".aspect h3").live('focus', AspectEdit.changeName);
-    
+    $("#manage_aspect_zones").find(".delete").click(AspectEdit.deletePerson);
+    $(".aspect h3").focus(AspectEdit.changeName);
+
   },
 
   startDrag: function() {
@@ -127,7 +127,7 @@ var AspectEdit = {
         e.preventDefault();
         $this.blur();
       }
-      
+
       //length limit
       if ($this.text().length >= 20) {
         e.preventDefault();
diff --git a/public/javascripts/inbox.js b/public/javascripts/inbox.js
index 013bcc136..250b54b3d 100644
--- a/public/javascripts/inbox.js
+++ b/public/javascripts/inbox.js
@@ -5,7 +5,7 @@
 
 $(document).ready(function(){
 
-  $('a.conversation').live('click', function(){
+  $('a.conversation').click(function(){
     $.getScript(this.href);
     history.pushState(null, "", this.href);
 
@@ -59,13 +59,13 @@ $(document).ready(function(){
 
   // kill scroll binding
   $(window).unbind('.infscr');
-  
+
   // hook up the manual click guy.
   $('a.next_page').click(function(){
     $(document).trigger('retrieve.infscr');
     return false;
   });
-  
+
   // remove the paginator when we're done.
   $(document).ajaxError(function(e,xhr,opt){
     if (xhr.status == 404) $('a.next_page').remove();
diff --git a/public/javascripts/stream.js b/public/javascripts/stream.js
index efe7f2cf7..133a25aec 100644
--- a/public/javascripts/stream.js
+++ b/public/javascripts/stream.js
@@ -51,21 +51,6 @@ var Stream = {
       $(this).siblings('.dislikes_list').fadeToggle('fast');
     });
 
-    $(".like_it, .dislike_it").live('ajax:loading', function(data, json, xhr) {
-      $(this).parent().fadeOut('fast');
-    });
-
-    $(".like_it, .dislike_it").live('ajax:success', function(data, json, xhr) {
-      $(this).parent().detach();
-      json = $.parseJSON(json);
-      WebSocketReceiver.processLike(json.post_id, json.html);
-    });
-
-    $('.like_it, .dislike_it').live('ajax:failure', function(data, html, xhr) {
-      Diaspora.widgets.alert.alert('Failed to like/dislike!');
-      $(this).parent().fadeIn('fast');
-    });
-
     // reshare button action
     $stream.delegate(".reshare_button", "click", function(evt) {
       evt.preventDefault();
@@ -123,6 +108,24 @@ var Stream = {
 
     });
   },
+  setUpLikes: function(){
+    var likes = $("#main_stream .like_it, #main_stream .dislike_it");
+
+    likes.live('ajax:loading', function(data, json, xhr) {
+      $(this).parent().fadeOut('fast');
+    });
+
+    likes.live('ajax:success', function(data, json, xhr) {
+      $(this).parent().detach();
+      json = $.parseJSON(json);
+      WebSocketReceiver.processLike(json.post_id, json.html);
+    });
+
+    likes.live('ajax:failure', function(data, html, xhr) {
+      Diaspora.widgets.alert.alert('Failed to like/dislike!');
+      $(this).parent().fadeIn('fast');
+    });
+  },
 
   setUpAudioLinks: function(){
     $(".stream a[target='_blank']").each(function(){