ajax load for additional inline replies; /replies variant of conversationview
This commit is contained in:
parent
057a831026
commit
4afa3caae3
106
actions/conversationreplies.php
Normal file
106
actions/conversationreplies.php
Normal file
@ -0,0 +1,106 @@
|
|||||||
|
<?php
|
||||||
|
/**
|
||||||
|
* Display a conversation in the browser
|
||||||
|
*
|
||||||
|
* PHP version 5
|
||||||
|
*
|
||||||
|
* @category Action
|
||||||
|
* @package StatusNet
|
||||||
|
* @author Evan Prodromou <evan@status.net>
|
||||||
|
* @license http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
|
||||||
|
* @link http://status.net/
|
||||||
|
*
|
||||||
|
* StatusNet - the distributed open-source microblogging tool
|
||||||
|
* Copyright (C) 2009, StatusNet, Inc.
|
||||||
|
*
|
||||||
|
* This program is free software: you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU Affero General Public License as published by
|
||||||
|
* the Free Software Foundation, either version 3 of the License, or
|
||||||
|
* (at your option) any later version.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU Affero General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU Affero General Public License
|
||||||
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
*/
|
||||||
|
|
||||||
|
if (!defined('STATUSNET') && !defined('LACONICA')) {
|
||||||
|
exit(1);
|
||||||
|
}
|
||||||
|
|
||||||
|
// XXX: not sure how to do paging yet,
|
||||||
|
// so set a 60-notice limit
|
||||||
|
|
||||||
|
require_once INSTALLDIR.'/lib/noticelist.php';
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Conversation tree in the browser
|
||||||
|
*
|
||||||
|
* @category Action
|
||||||
|
* @package StatusNet
|
||||||
|
* @author Evan Prodromou <evan@status.net>
|
||||||
|
* @license http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
|
||||||
|
* @link http://status.net/
|
||||||
|
*/
|
||||||
|
class ConversationRepliesAction extends ConversationAction
|
||||||
|
{
|
||||||
|
|
||||||
|
function handle($args)
|
||||||
|
{
|
||||||
|
if ($this->boolean('ajax')) {
|
||||||
|
$this->showAjax();
|
||||||
|
} else {
|
||||||
|
parent::handle($args);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Show content.
|
||||||
|
*
|
||||||
|
* Display a hierarchical unordered list in the content area.
|
||||||
|
* Uses ConversationTree to do most of the heavy lifting.
|
||||||
|
*
|
||||||
|
* @return void
|
||||||
|
*/
|
||||||
|
function showContent()
|
||||||
|
{
|
||||||
|
$notices = Notice::conversationStream($this->id, null, null);
|
||||||
|
|
||||||
|
$ct = new FullThreadedNoticeList($notices, $this);
|
||||||
|
|
||||||
|
$cnt = $ct->show();
|
||||||
|
}
|
||||||
|
|
||||||
|
function showAjax()
|
||||||
|
{
|
||||||
|
header('Content-Type: text/xml;charset=utf-8');
|
||||||
|
$this->xw->startDocument('1.0', 'UTF-8');
|
||||||
|
$this->elementStart('html');
|
||||||
|
$this->elementStart('head');
|
||||||
|
$this->element('title', null, _('Notice'));
|
||||||
|
$this->elementEnd('head');
|
||||||
|
$this->elementStart('body');
|
||||||
|
$this->showContent();
|
||||||
|
$this->elementEnd('body');
|
||||||
|
$this->elementEnd('html');
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
class FullThreadedNoticeList extends ThreadedNoticeList
|
||||||
|
{
|
||||||
|
function newListItem($notice)
|
||||||
|
{
|
||||||
|
return new FullThreadedNoticeListItem($notice, $this->out);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
class FullThreadedNoticeListItem extends ThreadedNoticeListItem
|
||||||
|
{
|
||||||
|
function initialItems()
|
||||||
|
{
|
||||||
|
return 1000; // @fixme
|
||||||
|
}
|
||||||
|
}
|
12
js/util.js
12
js/util.js
@ -666,6 +666,18 @@ var SN = { // StatusNet
|
|||||||
SN.U.NoticeInlineReplyTrigger(notice);
|
SN.U.NoticeInlineReplyTrigger(notice);
|
||||||
return false;
|
return false;
|
||||||
});
|
});
|
||||||
|
$('li.notice-reply-comments a')
|
||||||
|
.live('click', function() {
|
||||||
|
var url = $(this).attr('href');
|
||||||
|
var area = $(this).closest('.threaded-replies');
|
||||||
|
$.get(url, {ajax: 1}, function(data, textStatus, xhr) {
|
||||||
|
var replies = $('.threaded-replies', data);
|
||||||
|
if (replies.length) {
|
||||||
|
area.replaceWith(document._importNode(replies[0], true));
|
||||||
|
}
|
||||||
|
});
|
||||||
|
return false;
|
||||||
|
});
|
||||||
},
|
},
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
2
js/util.min.js
vendored
2
js/util.min.js
vendored
File diff suppressed because one or more lines are too long
@ -333,6 +333,9 @@ class Router
|
|||||||
$m->connect('conversation/:id',
|
$m->connect('conversation/:id',
|
||||||
array('action' => 'conversation'),
|
array('action' => 'conversation'),
|
||||||
array('id' => '[0-9]+'));
|
array('id' => '[0-9]+'));
|
||||||
|
$m->connect('conversation/:id/replies',
|
||||||
|
array('action' => 'conversationreplies'),
|
||||||
|
array('id' => '[0-9]+'));
|
||||||
|
|
||||||
$m->connect('message/new', array('action' => 'newmessage'));
|
$m->connect('message/new', array('action' => 'newmessage'));
|
||||||
$m->connect('message/new?to=:to', array('action' => 'newmessage'), array('to' => Nickname::DISPLAY_FMT));
|
$m->connect('message/new?to=:to', array('action' => 'newmessage'), array('to' => Nickname::DISPLAY_FMT));
|
||||||
|
@ -153,7 +153,10 @@ class ThreadedNoticeList extends NoticeList
|
|||||||
|
|
||||||
class ThreadedNoticeListItem extends NoticeListItem
|
class ThreadedNoticeListItem extends NoticeListItem
|
||||||
{
|
{
|
||||||
const INITIAL_ITEMS = 3;
|
function initialItems()
|
||||||
|
{
|
||||||
|
return 3;
|
||||||
|
}
|
||||||
|
|
||||||
function showContext()
|
function showContext()
|
||||||
{
|
{
|
||||||
@ -170,8 +173,9 @@ class ThreadedNoticeListItem extends NoticeListItem
|
|||||||
|
|
||||||
function showEnd()
|
function showEnd()
|
||||||
{
|
{
|
||||||
|
$max = $this->initialItems();
|
||||||
if (!$this->repeat) {
|
if (!$this->repeat) {
|
||||||
$notice = Notice::conversationStream($this->notice->conversation, 0, self::INITIAL_ITEMS + 2);
|
$notice = Notice::conversationStream($this->notice->conversation, 0, $max + 2);
|
||||||
$notices = array();
|
$notices = array();
|
||||||
$cnt = 0;
|
$cnt = 0;
|
||||||
$moreCutoff = null;
|
$moreCutoff = null;
|
||||||
@ -181,7 +185,7 @@ class ThreadedNoticeListItem extends NoticeListItem
|
|||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
$cnt++;
|
$cnt++;
|
||||||
if ($cnt > self::INITIAL_ITEMS) {
|
if ($cnt > $max) {
|
||||||
// boo-yah
|
// boo-yah
|
||||||
$moreCutoff = clone($notice);
|
$moreCutoff = clone($notice);
|
||||||
break;
|
break;
|
||||||
@ -289,7 +293,7 @@ class ThreadedNoticeListMoreItem extends NoticeListItem
|
|||||||
function showMiniForm()
|
function showMiniForm()
|
||||||
{
|
{
|
||||||
$id = $this->notice->conversation;
|
$id = $this->notice->conversation;
|
||||||
$url = common_local_url('conversation', array('id' => $id)) . '#notice-' . $this->notice->id;
|
$url = common_local_url('conversationreplies', array('id' => $id));
|
||||||
|
|
||||||
$notice = new Notice();
|
$notice = new Notice();
|
||||||
$notice->conversation = $id;
|
$notice->conversation = $id;
|
||||||
|
Loading…
Reference in New Issue
Block a user