diff --git a/public/javascripts/stream.js b/public/javascripts/stream.js index 7c05e2e0f..3b79acc2f 100644 --- a/public/javascripts/stream.js +++ b/public/javascripts/stream.js @@ -10,14 +10,6 @@ var Stream = { Diaspora.page.timeAgo.updateTimeAgo(); Diaspora.page.directionDetector.updateBinds(); - $.each(["a.stream_element_delete", "a.comment_delete", "span.post_scope"], function(idx, el){ - $(el).tipsy({ - trigger: "hover", - gravity: "n", - live: true - }); - }); - //audio links Stream.setUpAudioLinks(); //Stream.setUpImageLinks(); diff --git a/public/javascripts/widgets/comment.js b/public/javascripts/widgets/comment.js index aae33c81c..58112ac01 100644 --- a/public/javascripts/widgets/comment.js +++ b/public/javascripts/widgets/comment.js @@ -5,10 +5,11 @@ this.subscribe("widget/ready", function(evt, comment) { $.extend(self, { comment: comment, - deleteCommentLink: comment.find(".comment_delete") + deleteCommentLink: comment.find("a.comment_delete") }); self.deleteCommentLink.click(self.removeComment); + self.deleteCommentLink.tipsy({ trigger: "hover" }); }); this.removeComment = function(evt) { @@ -25,4 +26,4 @@ }; Diaspora.Widgets.Comment = Comment; -})(); \ No newline at end of file +})(); diff --git a/public/javascripts/widgets/stream-element.js b/public/javascripts/widgets/stream-element.js index 9da3596e5..7e1bcd0bd 100644 --- a/public/javascripts/widgets/stream-element.js +++ b/public/javascripts/widgets/stream-element.js @@ -10,9 +10,14 @@ commentStream: self.instantiate("CommentStream", element.find("ul.comments")), embedder: self.instantiate("Embedder", element.find("div.content")), likes: self.instantiate("Likes", element.find("div.likes_container")), - lightBox: self.instantiate("Lightbox", element) + lightBox: self.instantiate("Lightbox", element), + deletePostLink: element.find("a.stream_element_delete"), + postScope: element.find("span.post_scope") }); + self.deletePostLink.tipsy({ trigger: "hover" }); + self.postScope.tipsy({ trigger: "hover" }); + self.globalSubscribe("post/" + self.postGuid + "/comment/added", function(evt, comment) { self.commentStream.publish("comment/added", comment); }); @@ -24,4 +29,4 @@ }; Diaspora.Widgets.StreamElement = StreamElement; -})(); \ No newline at end of file +})();