Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x

This commit is contained in:
Zach Copley 2009-12-02 22:14:11 +00:00
commit 02bbebcd65

View File

@ -214,6 +214,9 @@ var SN = { // StatusNet
self.close(); self.close();
} }
var notices = $("#notices_primary .notices");
if (notices.length > 0) {
if ($('#'+SN.C.S.CommandResult, data).length > 0) { if ($('#'+SN.C.S.CommandResult, data).length > 0) {
result = document._importNode($('p', data)[0], true); result = document._importNode($('p', data)[0], true);
result = result.textContent || result.innerHTML; result = result.textContent || result.innerHTML;
@ -231,7 +234,7 @@ var SN = { // StatusNet
$($(notice_irt+' .notices')[0]).append(notice); $($(notice_irt+' .notices')[0]).append(notice);
} }
else { else {
$("#notices_primary .notices").prepend(notice); notices.prepend(notice);
} }
$('#'+notice.id).css({display:'none'}); $('#'+notice.id).css({display:'none'});
$('#'+notice.id).fadeIn(2500); $('#'+notice.id).fadeIn(2500);
@ -246,6 +249,7 @@ var SN = { // StatusNet
$('#'+form_id+' #'+SN.C.S.NoticeDataAttachSelected).remove(); $('#'+form_id+' #'+SN.C.S.NoticeDataAttachSelected).remove();
SN.U.FormNoticeEnhancements($('#'+form_id)); SN.U.FormNoticeEnhancements($('#'+form_id));
} }
}
}, },
complete: function(xhr, textStatus) { complete: function(xhr, textStatus) {
form.removeClass(SN.C.S.Processing); form.removeClass(SN.C.S.Processing);