a little js cleanup for post.js

demirkapi · Jul 12, 2011 · 039b65b · 039b65b
1 parent 0fbf366
commit 039b65b
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 27 deletions.
diff --git a/public/javascripts/widgets/post.js b/public/javascripts/widgets/post.js
@@ -5,34 +5,31 @@
 
 (function() {
   var Post = function() {
-    this.likesSelector = ".like_it, .dislike_it";
-    this.expandLikesSelector = "a.expand_likes, a.expand_dislikes";
-    this.start = function() {
-      //timeago
-      //set up ikes
-      //comments
-      //audio video links
-      //embedder
-      //
-
+    var self = this;
+    //timeago //set up ikes //comments //audio video links //embedder //
 
-      this.setUpLikes();
-    };
+    this.start = function() {
+      $.extend(self, {
+        likes: {
+          actions: $(".like_it, .dislike_it"),
+          expanders: $("a.expand_likes, a.expand_dislikes"),
+        }
+      });
+      self.setUpLikes();
+    },
 
     this.setUpLikes = function() {
-      $(this.expandLikesSelector).live("click", this.expandLikes);
-
-      var likeIt = $(this.likesSelector);
-
-      likeIt.live("ajax:loading", function() {
-        $(this).parent().fadeOut("fast");
+      self.likes.expanders.live("click", self.expandLikes);
+      self.likes.actions.live("ajax:loading", function() {
+        $(this).parent().fadeOut(100);
       });
 
-      likeIt.live("ajax:failure", function() {
+      self.likes.actions.live("ajax:failure", function() {
         Diaspora.widgets.alert.alert(Diaspora.widgets.i18n.t("failed_to_like"));
-        $(this).parent().fadeIn("fast");
+        $(this).parent().fadeIn(100);
       });
     };
+
     this.expandLikes = function(evt){
       evt.preventDefault();
       var likesList = $(this).siblings(".likes_list");
@@ -41,13 +38,13 @@
         $.ajax({
           url: this.href,
           success: function(data){
-            likesList.html(data);
-            likesList.fadeToggle("fast");
+            likesList.html(data)
+                     .fadeToggle(100);
           }
         });
-      }else {
-      likesList
-        .fadeToggle("fast");
+      }
+      else {
+        likesList.fadeToggle(100);
       }
     };
   };

diff --git a/spec/javascripts/widgets/post-spec.js b/spec/javascripts/widgets/post-spec.js
@@ -17,14 +17,14 @@ describe("Diaspora", function() {
         it("adds a listener for the click event on a.expand_likes", function() {
           spyOn(window, "$").andCallThrough();
           Diaspora.widgets.post.start();
-          expect($).toHaveBeenCalledWith(Diaspora.widgets.post.expandLikesSelector);
+          expect($).toHaveBeenCalledWith(Diaspora.widgets.post.likes.expanders);
           $.reset();
         });
 
         it("adds a listener for ajax:success and ajax:failure", function() {
           spyOn(window, "$").andCallThrough();
           Diaspora.widgets.post.start();
-          expect($).toHaveBeenCalledWith(Diaspora.widgets.post.likesSelector);
+          expect($).toHaveBeenCalledWith(Diaspora.widgets.post.likes.actions);
           $.reset();
         });
       });