Merge remote-tracking branch 'gitorious/1.0.x' into 1.0.x

This commit is contained in:
Evan Prodromou 2011-04-16 15:57:50 -04:00
commit c06aba6b0a
2 changed files with 8 additions and 3 deletions

View File

@ -644,8 +644,8 @@ var SN = { // StatusNet
// and we'll add on the end of it. Will add if needed. // and we'll add on the end of it. Will add if needed.
list = $('ul.threaded-replies', notice); list = $('ul.threaded-replies', notice);
if (list.length == 0) { if (list.length == 0) {
list = $('<ul class="notices threaded-replies xoxo"></ul>'); SN.U.NoticeInlineReplyPlaceholder(notice);
notice.append(list); list = $('ul.threaded-replies', notice);
} }
} }
@ -718,6 +718,11 @@ var SN = { // StatusNet
NoticeInlineReplyPlaceholder: function(notice) { NoticeInlineReplyPlaceholder: function(notice) {
var list = notice.find('ul.threaded-replies'); var list = notice.find('ul.threaded-replies');
if (list.length == 0) {
list = $('<ul class="notices threaded-replies xoxo"></ul>');
notice.append(list);
list = notice.find('ul.threaded-replies');
}
var placeholder = $('<li class="notice-reply-placeholder">' + var placeholder = $('<li class="notice-reply-placeholder">' +
'<input class="placeholder">' + '<input class="placeholder">' +
'</li>'); '</li>');

2
js/util.min.js vendored

File diff suppressed because one or more lines are too long