wamo/gnu-social
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Inline replies: fix replies on repeats, placeholder re-add when replying to a reply

Browse Source
This commit is contained in:
Brion Vibber 2011-03-01 13:49:13 -08:00
parent 35ce314bfb
commit c0dcd73379
2 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
js/util.js
View File

@ -557,27 +557,28 @@ var SN = { // StatusNet
e.preventDefault(); e.preventDefault();
var nickname = ($('.author .nickname', notice).length > 0) ? $($('.author .nickname', notice)[0]) : $('.author .nickname.uid'); var nickname = ($('.author .nickname', notice).length > 0) ? $($('.author .nickname', notice)[0]) : $('.author .nickname.uid');
/* SN.U.NoticeReplySet(nickname.text(), $($('.notice_id', notice)[0]).text()); */ /* SN.U.NoticeReplySet(nickname.text(), $($('.notice_id', notice)[0]).text()); */
var id = $($('.notice_id', notice)[0]).text(); SN.U.NoticeInlineReplyTrigger(notice, '@' + nickname.text());
SN.U.NoticeInlineReplyTrigger(id, '@' + nickname.text());
return false; return false;
}); });
}, },
/** /**
* Open up a notice's * Open up a notice's inline reply box.
* @param {String} id: notice ID *
* @param {jQuery} notice: jQuery object containing one notice
* @param {String} initialText * @param {String} initialText
*/ */
NoticeInlineReplyTrigger: function(id, initialText) { NoticeInlineReplyTrigger: function(notice, initialText) {
// Find the notice we're replying to... // Find the notice we're replying to...
var notice = $('#notice-' + id), parentNotice = notice; var id = $($('.notice_id', notice)[0]).text();
var parentNotice = notice;
// Find the threaded replies view we'll be adding to... // Find the threaded replies view we'll be adding to...
var list = notice.closest('.notices'); var list = notice.closest('.notices');
if (list.hasClass('threaded-notices')) { if (list.hasClass('threaded-notices')) {
// We're replying to a reply; use reply form on the end of this list. // We're replying to a reply; use reply form on the end of this list.
// We'll add our form at the end of this; grab the root notice. // We'll add our form at the end of this; grab the root notice.
parentNotice = list.closest('notice'); parentNotice = list.closest('.notice');
} else { } else {
// We're replying to a parent notice; pull its threaded list // We're replying to a parent notice; pull its threaded list
// 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.
@ -642,8 +643,6 @@ var SN = { // StatusNet
var li = document._importNode(orig_li, true); var li = document._importNode(orig_li, true);
replyItem.replaceWith(li); replyItem.replaceWith(li);
SN.U.NoticeInlineReplyPlaceholder(parentNotice); SN.U.NoticeInlineReplyPlaceholder(parentNotice);
} else {
console.log('confused!', data);
} }
} }
}); });
@ -712,13 +711,12 @@ var SN = { // StatusNet
}, },
NoticeInlineReplyPlaceholder: function(notice) { NoticeInlineReplyPlaceholder: function(notice) {
var id = $($('.notice_id', notice)[0]).text();
var list = notice.find('ul.threaded-notices'); var list = notice.find('ul.threaded-notices');
var placeholder = $('<li class="notice-reply-placeholder">' + var placeholder = $('<li class="notice-reply-placeholder">' +
'<input class="placeholder">' + '<input class="placeholder">' +
'</li>'); '</li>');
placeholder.click(function() { placeholder.click(function() {
SN.U.NoticeInlineReplyTrigger(id); SN.U.NoticeInlineReplyTrigger(notice);
}); });
placeholder.find('input').val(SN.msg('reply_comment')); placeholder.find('input').val(SN.msg('reply_comment'));
list.append(placeholder); list.append(placeholder);

2
js/util.min.js vendored
View File

File diff suppressed because one or more lines are too long