summaryrefslogtreecommitdiff
path: root/plugins/Realtime/RealtimePlugin.php
diff options
context:
space:
mode:
authorEvan Prodromou <evan@status.net>2009-09-23 09:45:22 -0400
committerEvan Prodromou <evan@status.net>2009-09-23 09:45:22 -0400
commit8284b3cb82f4dec6e0f2bf74dea6e1a3bc7f4eac (patch)
tree09b8c466df2476f9219550464eb73f6ecaa54e1c /plugins/Realtime/RealtimePlugin.php
parent2cabfba767ba0d92d34a6ea4e4cf91c7325f3e95 (diff)
parentbef4a8b6ba9e19f2ec629031444279ca76f17bcf (diff)
Merge branch '0.8.x' into 0.9.x
Conflicts: actions/requesttoken.php classes/File.php install.php lib/noticeform.php
Diffstat (limited to 'plugins/Realtime/RealtimePlugin.php')
-rw-r--r--plugins/Realtime/RealtimePlugin.php46
1 files changed, 28 insertions, 18 deletions
diff --git a/plugins/Realtime/RealtimePlugin.php b/plugins/Realtime/RealtimePlugin.php
index 82eca3d08..611b1d86c 100644
--- a/plugins/Realtime/RealtimePlugin.php
+++ b/plugins/Realtime/RealtimePlugin.php
@@ -63,20 +63,22 @@ class RealtimePlugin extends Plugin
{
$path = null;
- switch ($action->trimmed('action')) {
- case 'public':
- $path = array('public');
- break;
- case 'tag':
- $tag = $action->trimmed('tag');
- if (!empty($tag)) {
- $path = array('tag', $tag);
- } else {
+ $a = $action->trimmed('action');
+
+ switch ($a) {
+ case 'public': case 'all': case 'replies': case 'showstream':
+ $path = array($a);
+ break;
+ case 'tag':
+ $tag = $action->trimmed('tag');
+ if (!empty($tag)) {
+ $path = array('tag', $tag);
+ } else {
+ return true;
+ }
+ break;
+ default:
return true;
- }
- break;
- default:
- return true;
}
$timeline = $this->_pathToChannel($path);
@@ -95,10 +97,16 @@ class RealtimePlugin extends Plugin
$user_id = 0;
}
+ $action->script('plugins/Realtime/jquery.getUrlParam.js');
+
$action->elementStart('script', array('type' => 'text/javascript'));
- $action->raw("$(document).ready(function() { ");
- $action->raw($this->_updateInitialize($timeline, $user_id));
- $action->raw(" });");
+ $action->raw('
+ <!--
+ $(document).ready(function() {
+ ' . $this->_updateInitialize($timeline, $user_id) . '
+ });
+ -->
+ ');
$action->elementEnd('script');
return true;
@@ -108,11 +116,13 @@ class RealtimePlugin extends Plugin
{
$paths = array();
- // XXX: Add other timelines; this is just for the public one
+ // TODO: Replies timeline
if ($notice->is_local ||
($notice->is_local == 0 && !common_config('public', 'localonly'))) {
- $paths[] = array('public');
+ foreach (array('public', 'all', 'replies', 'showstream') as $a) {
+ $paths[] = array($a);
+ }
}
$tags = $this->getNoticeTags($notice);