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:
Michael Sofaer 2010-12-04 17:19:11 -08:00
commit a522655a19
1 changed files with 13 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
public/javascripts/web-socket-receiver.js
View file

@ -91,21 +91,24 @@ processPerson: function(response){
processPost: function(className, postId, html, aspectIds){ processPost: function(className, postId, html, aspectIds){
if(WebSocketReceiver.onPageForAspects(aspectIds)){ if(WebSocketReceiver.onPageForAspects(aspectIds)){
if( $("#no_posts").is(":visible") ){ WebSocketReceiver.addPostToStream(postId, html);
$("#no_posts").fadeOut(400, WebSocketReceiver.addPostToStream(postId, html)).hide();
} else {
WebSocketReceiver.addPostToStream(postId, html);
}
} }
}, },
addPostToStream: function(postId, html){ addPostToStream: function(postId, html){
if( $(".message[data-guid='"+postId+"']").length == 0 ){ if( $(".message[data-guid='"+postId+"']").length == 0 ){
$("#main_stream:not('.show')").prepend( var showMessage = function(){ $("#main_stream:not('.show')").prepend(
$(html).fadeIn("fast", function(){ $(html).fadeIn("fast", function(){
$("#main_stream").find("label").first().inFieldLabels(); $("#main_stream").find("label").first().inFieldLabels();
}) })
); );
};
if( $("#no_posts").is(":visible") ){
$("#no_posts").fadeOut(400, showMessage()).hide();
} else {
showMessage();
}
} }
}, },