Commit 764d069c authored by Brion Vibber's avatar Brion Vibber

Clean up threaded notices vs replies classes, and fixed realtime's threaded...

Clean up threaded notices vs replies classes, and fixed realtime's threaded behavior to only run on threaded lists
parent 9fd2ee86
......@@ -575,16 +575,16 @@ var SN = { // StatusNet
// Find the threaded replies view we'll be adding to...
var list = notice.closest('.notices');
if (list.hasClass('threaded-notices')) {
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');
} 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.
list = $('ul.threaded-notices', notice);
list = $('ul.threaded-replies', notice);
if (list.length == 0) {
list = $('<ul class="notices threaded-notices xoxo"></ul>');
list = $('<ul class="notices threaded-replies xoxo"></ul>');
notice.append(list);
}
}
......@@ -731,7 +731,7 @@ var SN = { // StatusNet
},
NoticeInlineReplyPlaceholder: function(notice) {
var list = notice.find('ul.threaded-notices');
var list = notice.find('ul.threaded-replies');
var placeholder = $('<li class="notice-reply-placeholder">' +
'<input class="placeholder">' +
'</li>');
......@@ -749,7 +749,7 @@ var SN = { // StatusNet
* Uses 'live' rather than 'bind', so applies to future as well as present items.
*/
NoticeInlineReplySetup: function() {
$('.threaded-notices').each(function() {
$('.threaded-replies').each(function() {
var list = $(this);
var notice = list.closest('.notice');
SN.U.NoticeInlineReplyPlaceholder(notice);
......
This diff is collapsed.
......@@ -64,7 +64,7 @@ class ThreadedNoticeList extends NoticeList
{
$this->out->elementStart('div', array('id' =>'notices_primary'));
$this->out->element('h2', null, _('Notices'));
$this->out->elementStart('ol', array('class' => 'notices xoxo'));
$this->out->elementStart('ol', array('class' => 'notices threaded-notices xoxo'));
$cnt = 0;
$conversations = array();
......@@ -182,7 +182,7 @@ class ThreadedNoticeListItem extends NoticeListItem
}
if ($notices) {
$this->out->elementStart('ul', 'notices threaded-notices xoxo');
$this->out->elementStart('ul', 'notices threaded-replies xoxo');
if ($moreCutoff) {
$item = new ThreadedNoticeListMoreItem($moreCutoff, $this->out);
$item->show();
......
......@@ -169,7 +169,7 @@ RealtimeUpdate = {
var list = $("#notices_primary .notices:first")
var prepend = true;
var threaded = true;
var threaded = list.hasClass('threaded-notices');
if (threaded && data.in_reply_to_status_id) {
// aho!
var parent = $('#notice-' + data.in_reply_to_status_id);
......@@ -179,12 +179,12 @@ RealtimeUpdate = {
// Check the parent notice to make sure it's not a reply itself.
// If so, use it's parent as the parent.
var parentList = parent.closest('.notices');
if (parentList.hasClass('threaded-notices')) {
if (parentList.hasClass('threaded-replies')) {
parent = parentList.closest('.notice');
}
list = parent.find('.threaded-notices');
list = parent.find('.threaded-replies');
if (list.length == 0) {
list = $('<ul class="notices threaded-notices xoxo"></ul>');
list = $('<ul class="notices threaded-replies xoxo"></ul>');
parent.append(list);
}
prepend = false;
......
This diff is collapsed.
......@@ -1106,38 +1106,38 @@ border-top-style:solid;
}
/* Threaded notices sublist */
#content .notices .threaded-notices {
#content .notices .threaded-replies {
margin-left: 10%;
width: 90%;
background: #e4e8f1;
}
#content .threaded-notices .notice .author .photo {
#content .threaded-replies .notice .author .photo {
left: 8px;
width: 32px;
height: 32px;
}
.threaded-notices .notice-reply {
.threaded-replies .notice-reply {
margin: 8px;
}
.threaded-notices .notice-reply textarea,
.threaded-notices .notice-reply-placeholder input.placeholder {
.threaded-replies .notice-reply textarea,
.threaded-replies .notice-reply-placeholder input.placeholder {
margin-left: 0;
width: 95%;
}
.threaded-notices .notice-reply-placeholder input.placeholder {
.threaded-replies .notice-reply-placeholder input.placeholder {
color: gray;
margin-left: 8px; /* ?? */
margin-bottom: 8px;
}
.threaded-notices .notice-reply .controls {
.threaded-replies .notice-reply .controls {
text-align: right;
}
.threaded-notices .notice-reply-comments {
.threaded-replies .notice-reply-comments {
margin: 8px;
}
.threaded-notices .response,
.threaded-notices .source {
.threaded-replies .response,
.threaded-replies .source {
/* Hide these for ajax/realtime sourced notices */
display: none;
}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment