From 73f852c6c239710b59e96c0eadac151668cbb7a3 Mon Sep 17 00:00:00 2001
From: MrZYX <pr0fkill@gmail.com>
Date: Tue, 15 Mar 2011 17:48:28 +0100
Subject: [PATCH] fixed video embedding in comments

---
 app/views/shared/_stream_element.html.haml |  4 ++--
 public/javascripts/widgets/embedder.js     | 11 ++++++-----
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/app/views/shared/_stream_element.html.haml b/app/views/shared/_stream_element.html.haml
index c0d4d079d..1f31ea14d 100644
--- a/app/views/shared/_stream_element.html.haml
+++ b/app/views/shared/_stream_element.html.haml
@@ -16,8 +16,8 @@
     .from
       = person_link(post.author, :class => 'author')
       %time.timeago{:datetime => post.created_at}
-      %p
-        = render 'status_messages/status_message', :post => post, :photos => post.photos
+    %p
+      = render 'status_messages/status_message', :post => post, :photos => post.photos
 
     .info
       - if post.public?
diff --git a/public/javascripts/widgets/embedder.js b/public/javascripts/widgets/embedder.js
index 68b84ca46..ad2be8a6d 100644
--- a/public/javascripts/widgets/embedder.js
+++ b/public/javascripts/widgets/embedder.js
@@ -24,7 +24,7 @@
     var service = $this.data("host"),
       container = document.createElement("div"),
       $container = $(container).attr("class", "video-container"),
-      $videoContainer = $this.closest(".from").siblings(".video-container");
+      $videoContainer = $this.closest('.content').children(".video-container");
 
     if($videoContainer.length) {
       $videoContainer.slideUp("fast", function() { $(this).detach(); });
@@ -40,8 +40,9 @@
     );
 
     $container.hide()
-      .insertBefore($this.closest(".from").siblings(".info"))
-      .slideDown('fast');
+     .insertAfter($this.parent())
+     .slideDown('fast');
+
 
     $this.click(function() {
       $container.slideUp('fast', function() {
@@ -55,8 +56,8 @@
     this.registerServices();
 
     var $post = $("#main_stream").children(".stream_element:first"),
-      $contentParagraph = $post.children(".content").children(".from").children("p"),
-      $infoDiv = $contentParagraph.closest(".from").siblings(".info");
+      $contentParagraph = $post.children(".content").children("p"),
+      $infoDiv = $contentParagraph.prev(".from").siblings(".info");
 
     this.canEmbed = $infoDiv.length;
   };