From 7e20cece42e97f365631eb74ee0d3f87f43e9dec Mon Sep 17 00:00:00 2001
From: Dan Hansen <mokker1234@gmail.com>
Date: Tue, 30 Aug 2011 21:44:43 -0500
Subject: [PATCH] remove stray console.logs, set $.fx.off to true to make the
failing likes spec pass in firefox
---
public/javascripts/widgets/embedder.js | 6 +-----
public/javascripts/widgets/likes.js | 16 +++++++++-------
spec/javascripts/widgets/likes-spec.js | 5 +++++
3 files changed, 15 insertions(+), 12 deletions(-)
diff --git a/public/javascripts/widgets/embedder.js b/public/javascripts/widgets/embedder.js
index d73dbe0f31..d9b400eeea 100644
--- a/public/javascripts/widgets/embedder.js
+++ b/public/javascripts/widgets/embedder.js
@@ -24,9 +24,7 @@
var template = (typeof self.services[service] === "string")
? self.services[service]
: self.services.undefined;
-
- console.log(template);
- console.log(views);
+
return $.mustache(template, views);
};
@@ -50,10 +48,8 @@
$("div.video-container").slideUp("fast", function() { $(this).detach(); });
}
- console.log(videoLink.data());
container.html(
self.render(host, videoLink.data())
-
);
container.hide()
diff --git a/public/javascripts/widgets/likes.js b/public/javascripts/widgets/likes.js
index 4daadbb37e..5be3f7c546 100644
--- a/public/javascripts/widgets/likes.js
+++ b/public/javascripts/widgets/likes.js
@@ -2,10 +2,12 @@
var Likes = function() {
var self = this;
- this.subscribe("widget/ready", function(evt, element) {
+ this.subscribe("widget/ready", function(evt, likesContainer) {
$.extend(self, {
+ likesContainer: likesContainer,
+ likesList: likesContainer.find(".likes_list"),
loadingImage: $("<img/>", { src: "/images/ajax-loader.gif" }),
- expander: element.find("a.expand_likes")
+ expander: likesContainer.find("a.expand_likes")
});
self.expander.click(self.expandLikes);
@@ -14,18 +16,18 @@
this.expandLikes = function(evt) {
evt.preventDefault();
- var likesList = self.expander.siblings(".likes_list");
- if(likesList.children().length == 0) {
- self.loadingImage.appendTo(likesList.parent());
+ if(self.likesList.children().length == 0) {
+ self.loadingImage.appendTo(self.likesContainer);
+
$.get(self.expander.attr('href'), function(data) {
self.loadingImage.fadeOut(100, function() {
- likesList.html(data)
+ self.likesList.html(data)
.fadeToggle(100);
});
});
}
else {
- likesList.fadeToggle(100);
+ self.likesList.fadeToggle(100);
}
};
};
diff --git a/spec/javascripts/widgets/likes-spec.js b/spec/javascripts/widgets/likes-spec.js
index ceb1874b3b..f138abb984 100644
--- a/spec/javascripts/widgets/likes-spec.js
+++ b/spec/javascripts/widgets/likes-spec.js
@@ -3,6 +3,7 @@ describe("Diaspora.Widgets.Likes", function() {
beforeEach(function() {
spec.loadFixture("aspects_index_with_a_post_with_likes");
likes = Diaspora.BaseWidget.instantiate("Likes", $(".stream_element .likes_container"));
+ $.fx.off = true;
});
describe("integration", function() {
@@ -50,4 +51,8 @@ describe("Diaspora.Widgets.Likes", function() {
expect($(".stream_element .likes_list").html()).toEqual("some html response");
});
});
+
+ afterEach(function() {
+ $.fx.off = false;
+ });
});
--
GitLab