nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

remove stray console.logs, set $.fx.off to true to make the failing likes spec pass in firefox

Browse source
This commit is contained in:
Dan Hansen 2011-08-30 21:44:43 -05:00
parent f788de17fd
commit 7e20cece42
3 changed files with 15 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
public/javascripts/widgets/embedder.js
View file

@ -24,9 +24,7 @@
var template = (typeof self.services[service] === "string") var template = (typeof self.services[service] === "string")
? self.services[service] ? self.services[service]
: self.services.undefined; : self.services.undefined;
console.log(template);
console.log(views);
return $.mustache(template, views); return $.mustache(template, views);
}; };
@ -50,10 +48,8 @@
$("div.video-container").slideUp("fast", function() { $(this).detach(); }); $("div.video-container").slideUp("fast", function() { $(this).detach(); });
} }
console.log(videoLink.data());
container.html( container.html(
self.render(host, videoLink.data()) self.render(host, videoLink.data())
); );
container.hide() container.hide()

16
public/javascripts/widgets/likes.js
View file

@ -2,10 +2,12 @@
var Likes = function() { var Likes = function() {
var self = this; var self = this;
this.subscribe("widget/ready", function(evt, element) { this.subscribe("widget/ready", function(evt, likesContainer) {
$.extend(self, { $.extend(self, {
likesContainer: likesContainer,
likesList: likesContainer.find(".likes_list"),
loadingImage: $("<img/>", { src: "/images/ajax-loader.gif" }), loadingImage: $("<img/>", { src: "/images/ajax-loader.gif" }),
expander: element.find("a.expand_likes") expander: likesContainer.find("a.expand_likes")
}); });
self.expander.click(self.expandLikes); self.expander.click(self.expandLikes);
@ -14,18 +16,18 @@
this.expandLikes = function(evt) { this.expandLikes = function(evt) {
evt.preventDefault(); evt.preventDefault();
var likesList = self.expander.siblings(".likes_list"); if(self.likesList.children().length == 0) {
if(likesList.children().length == 0) { self.loadingImage.appendTo(self.likesContainer);
self.loadingImage.appendTo(likesList.parent());
$.get(self.expander.attr('href'), function(data) { $.get(self.expander.attr('href'), function(data) {
self.loadingImage.fadeOut(100, function() { self.loadingImage.fadeOut(100, function() {
likesList.html(data) self.likesList.html(data)
.fadeToggle(100); .fadeToggle(100);
}); });
}); });
} }
else { else {
likesList.fadeToggle(100); self.likesList.fadeToggle(100);
} }
}; };
}; };

5
spec/javascripts/widgets/likes-spec.js
View file

@ -3,6 +3,7 @@ describe("Diaspora.Widgets.Likes", function() {
beforeEach(function() { beforeEach(function() {
spec.loadFixture("aspects_index_with_a_post_with_likes"); spec.loadFixture("aspects_index_with_a_post_with_likes");
likes = Diaspora.BaseWidget.instantiate("Likes", $(".stream_element .likes_container")); likes = Diaspora.BaseWidget.instantiate("Likes", $(".stream_element .likes_container"));
$.fx.off = true;
}); });
describe("integration", function() { describe("integration", function() {
@ -50,4 +51,8 @@ describe("Diaspora.Widgets.Likes", function() {
expect($(".stream_element .likes_list").html()).toEqual("some html response"); expect($(".stream_element .likes_list").html()).toEqual("some html response");
}); });
}); });
afterEach(function() {
$.fx.off = false;
});
}); });