diff options
| author | Zach Copley <zach@status.net> | 2009-12-02 15:32:26 -0800 |
|---|---|---|
| committer | Zach Copley <zach@status.net> | 2009-12-02 15:32:26 -0800 |
| commit | 987d59c2421bc44b6c860c8bce47af2b33339929 (patch) | |
| tree | fd7ba2595a4d0f03ae417d16dbc3fbf562991364 | |
| parent | 0c0f92845992b251c86c55979896d1ea1b9c7276 (diff) | |
If an XHR notice is sent form a page that has no timeline, show a
message like 'Notice sent'
Conflicts:
js/util.js
| -rw-r--r-- | js/util.js | 42 |
1 files changed, 25 insertions, 17 deletions
diff --git a/js/util.js b/js/util.js index 5c581afb9..766201a45 100644 --- a/js/util.js +++ b/js/util.js @@ -218,25 +218,33 @@ var SN = { // StatusNet alert(result.textContent || result.innerHTML); } else { - notice = document._importNode($('li', data)[0], true); - if ($('#'+notice.id).length === 0) { - var notice_irt_value = $('#'+SN.C.S.NoticeInReplyTo).val(); - var notice_irt = '#notices_primary #notice-'+notice_irt_value; - if($('body')[0].id == 'conversation') { - if(notice_irt_value.length > 0 && $(notice_irt+' .notices').length < 1) { - $(notice_irt).append('<ul class="notices"></ul>'); + var notices = $('#notices_primary .notices'); + if (notices.length > 0) { + var notice = document._importNode($('li', data)[0], true); + if ($('#'+notice.id).length === 0) { + var notice_irt_value = $('#'+SN.C.S.NoticeInReplyTo).val(); + var notice_irt = '#notices_primary #notice-'+notice_irt_value; + if($('body')[0].id == 'conversation') { + if(notice_irt_value.length > 0 && $(notice_irt+' .notices').length < 1) { + $(notice_irt).append('<ul class="notices"></ul>'); + } + $($(notice_irt+' .notices')[0]).append(notice); } - $($(notice_irt+' .notices')[0]).append(notice); - } - else { - $("#notices_primary .notices").prepend(notice); + else { + notices.prepend(notice); + } + $('#'+notice.id).css({display:'none'}); + $('#'+notice.id).fadeIn(2500); + SN.U.NoticeWithAttachment($('#'+notice.id)); + SN.U.NoticeReplyTo($('#'+notice.id)); + SN.U.FormXHR($('#'+notice.id+' .form_favor')); } - $('#'+notice.id).css({display:'none'}); - $('#'+notice.id).fadeIn(2500); - SN.U.NoticeAttachments(); - SN.U.NoticeReplyTo($('#'+notice.id)); - SN.U.FormXHR($('#'+notice.id+' .form_favor')); - } + } + else { + result = document._importNode($('title', data)[0], true); + result_title = result.textContent || result.innerHTML; + form.append('<p class="success">'+result_title+'</p>'); + } } $('#'+form_id+' #'+SN.C.S.NoticeDataText).val(''); $('#'+form_id+' #'+SN.C.S.NoticeDataAttach).val(''); |