diff options
| author | Jeffery To <jeffery.to@gmail.com> | 2009-06-14 15:45:58 +0800 |
|---|---|---|
| committer | Jeffery To <jeffery.to@gmail.com> | 2009-06-14 15:45:58 +0800 |
| commit | bb3361467c002e38aa3a424672f332b32a647e17 (patch) | |
| tree | 233e008fe7ea0962b7a2d26e3f485f4a3e76ec69 /js/util.js | |
| parent | 53f31a247e4355318e8a997451930a1b1772099c (diff) | |
| parent | 77c94c44a622052366dcc03fee522232672d71d9 (diff) | |
Merge branch '0.8.x' into small-fixes
Diffstat (limited to 'js/util.js')
| -rw-r--r-- | js/util.js | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/js/util.js b/js/util.js index 786b763ee..fd2500d44 100644 --- a/js/util.js +++ b/js/util.js @@ -203,10 +203,20 @@ $(document).ready(function(){ else { li = $("li", xml).get(0); if ($("#"+li.id).length == 0) { - $("#notices_primary .notices").prepend(document._importNode(li, true)); - $("#notices_primary .notice:first").css({display:"none"}); - $("#notices_primary .notice:first").fadeIn(2500); - NoticeReply(); + var notice_irt_value = $('#notice_in-reply-to').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(document._importNode(li, true)); + } + else { + $("#notices_primary .notices").prepend(document._importNode(li, true)); + } + $('#'+li.id).css({display:'none'}); + $('#'+li.id).fadeIn(2500); + NoticeReply(); } } $("#notice_data-text").val(""); @@ -310,4 +320,3 @@ function NoticeAttachments() { } ); } - |