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

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

Browse source
This commit is contained in:
Sarah Mei 2011-08-30 21:05:00 -07:00
commit 31239df8b9
3 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
public/javascripts/widgets/comment.js
View file

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

8
public/javascripts/widgets/search.js
View file

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

2
public/javascripts/widgets/stream-element.js
View file

@ -9,7 +9,7 @@
commentForm: self.instantiate("CommentForm", element.find("form.new_comment")), commentForm: self.instantiate("CommentForm", element.find("form.new_comment")),
commentStream: self.instantiate("CommentStream", element.find(".comment_stream")), commentStream: self.instantiate("CommentStream", element.find(".comment_stream")),
embedder: self.instantiate("Embedder", element.find("div.content")), 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), lightBox: self.instantiate("Lightbox", element),
timeAgo: self.instantiate("TimeAgo", element.find(".timeago a abbr.timeago")), timeAgo: self.instantiate("TimeAgo", element.find(".timeago a abbr.timeago")),