Merge branch 'master' of github.com:diaspora/diaspora

public/javascripts/widgets/comment.js

@@ -6,6 +6,7 @@
       $.extend(self, {
         comment: comment,
         deleteCommentLink: comment.find("a.comment_delete"),
+        likes: self.instantiate("Likes", comment.find(".likes_container")),
         timeAgo: self.instantiate("TimeAgo", comment.find("abbr.timeago")),
         content: comment.find(".content span")
       });

public/javascripts/widgets/search.js

@@ -32,9 +32,9 @@
         return Diaspora.I18n.t("search_for", row);
       } else {
         return $("<img/>", {
-          'class': "avatar",
+          "class": "avatar",
           src: row.avatar
-        }).html() + row.name;
+        })[0].outerHTML + row.name;
       }
     };
 
@@ -63,11 +63,11 @@
       if (data['search'] === true) { // The placeholder "search for" result
         window.location = self.searchFormAction + '?' + self.searchInputName + '=' + data['name'];
       } else { // The actual result
-        element.val(formatted);
+        self.options.element.val(formatted);
         window.location = data['url'];
       }
     };
   };
 
   Diaspora.Widgets.Search = Search;
-})();
+})();

public/javascripts/widgets/stream-element.js

@@ -9,7 +9,7 @@
         commentForm: self.instantiate("CommentForm", element.find("form.new_comment")),
         commentStream: self.instantiate("CommentStream", element.find(".comment_stream")),
         embedder: self.instantiate("Embedder", element.find("div.content")),
-        likes: self.instantiate("Likes", element.find("div.likes_container")),
+        likes: self.instantiate("Likes", element.find(".likes.on_post .likes_container:first")),
         lightBox: self.instantiate("Lightbox", element),
         timeAgo: self.instantiate("TimeAgo", element.find(".timeago a abbr.timeago")),