From 2ba1198b906f5dc99cad7135c4b8baa06504800d Mon Sep 17 00:00:00 2001 From: MrZYX Date: Sat, 2 Apr 2011 17:19:56 +0200 Subject: [PATCH] fixed embedder (again) --- public/javascripts/widgets/embedder.js | 5 ++--- spec/javascripts/embedder-spec.js | 11 ++++------- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/public/javascripts/widgets/embedder.js b/public/javascripts/widgets/embedder.js index ad2be8a6d..99d1d8473 100644 --- a/public/javascripts/widgets/embedder.js +++ b/public/javascripts/widgets/embedder.js @@ -56,10 +56,9 @@ this.registerServices(); var $post = $("#main_stream").children(".stream_element:first"), - $contentParagraph = $post.children(".content").children("p"), - $infoDiv = $contentParagraph.prev(".from").siblings(".info"); + $contentParagraph = $post.children(".sm_body").children('.content').children("p"); - this.canEmbed = $infoDiv.length; + this.canEmbed = $contentParagraph.length; }; Embedder.prototype.registerServices = function() { diff --git a/spec/javascripts/embedder-spec.js b/spec/javascripts/embedder-spec.js index f6567c9d2..c3414c063 100644 --- a/spec/javascripts/embedder-spec.js +++ b/spec/javascripts/embedder-spec.js @@ -50,13 +50,10 @@ describe("Diaspora", function() { it("has to have a certain DOM structure", function() { spec.loadFixture("aspects_index_with_posts"); - var $post = $("#main_stream").children(".stream_element:first"); - var $contentParagraph = $post.find(".sm_body .content").children("p"); - console.log($contentParagraph); - var $infoDiv = $contentParagraph.prev(".from").siblings(".info"); - - console.log($infoDiv); - expect($infoDiv.length).toEqual(1); + var $post = $("#main_stream").children(".stream_element:first"), + $contentParagraph = $post.children(".sm_body").children('.content').children("p"); + + expect($contentParagraph.length).toEqual(1); }); }); });