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

Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x

Browse Source
This commit is contained in:
Evan Prodromou 2011-09-26 16:15:52 -04:00
commit a1fd6e0fa4
3 changed files with 23 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
js/util.js
View File

@ -638,13 +638,23 @@ var SN = { // StatusNet
// Find the notice we're replying to...
var id = $($('.notice_id', notice)[0]).text();
var parentNotice = notice;
var stripForm = true; // strip a couple things out of reply forms that are inline
// Find the threaded replies view we'll be adding to...
var list = notice.closest('.notices');
if (list.hasClass('threaded-replies')) {
if (list.closest('.old-school').length) {
// We're replying to an old-school conversation thread;
// use the old-style ping into the top form.
SN.U.switchInputFormTab("status")
replyForm = $('#input_form_status').find('form');
stripForm = false;
} else if (list.hasClass('threaded-replies')) {
// 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.
parentNotice = list.closest('.notice');
// See if the form's already open...
var replyForm = $('.notice-reply-form', list);
} else {
// We're replying to a parent notice; pull its threaded list
// and we'll add on the end of it. Will add if needed.
@ -658,18 +668,21 @@ var SN = { // StatusNet
SN.U.NoticeInlineReplyPlaceholder(notice);
}
}
}
// See if the form's already open...
var replyForm = $('.notice-reply-form', list);
// See if the form's already open...
var replyForm = $('.notice-reply-form', list);
}
var nextStep = function() {
// Override...?
replyForm.find('input[name=inreplyto]').val(id);
replyForm.find('#notice_to').attr('disabled', 'disabled').hide();
replyForm.find('#notice_private').attr('disabled', 'disabled').hide();
replyForm.find('label[for=notice_to]').hide();
replyForm.find('label[for=notice_private]').hide();
if (stripForm) {
// Don't do this for old-school reply form, as they don't come back!
replyForm.find('#notice_to').attr('disabled', 'disabled').hide();
replyForm.find('#notice_private').attr('disabled', 'disabled').hide();
replyForm.find('label[for=notice_to]').hide();
replyForm.find('label[for=notice_private]').hide();
}
// Set focus...
var text = replyForm.find('textarea');

2
js/util.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
lib/conversationtree.php
View File

@ -62,7 +62,7 @@ class ConversationTree extends NoticeList
$this->out->elementStart('div', array('id' =>'notices_primary'));
// TRANS: Header on conversation page. Hidden by default (h2).
$this->out->element('h2', null, _('Notices'));
$this->out->elementStart('ol', array('class' => 'notices xoxo'));
$this->out->elementStart('ol', array('class' => 'notices xoxo old-school'));
if (array_key_exists('root', $this->tree)) {
$rootid = $this->tree['root'][0];