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

This commit is contained in:
Sarah Mei 2011-01-12 21:57:43 -08:00
commit e456c9d880

View file

@ -86,7 +86,7 @@ var Stream = {
var $this = $(this),
container = document.createElement("div"),
$container = $(container).attr("class", "video-container"),
$videoContainer = $this.parent().siblings("div.video-container");
$videoContainer = $this.siblings("div.video-container");
if ($videoContainer.length > 0) {
$videoContainer.slideUp('fast', function() {
@ -116,7 +116,7 @@ var Stream = {
}
$container.hide()
.insertAfter($this.parent())
.insertAfter($this)
.slideDown('fast');
$this.click(function() {