diff options
| author | Sarven Capadisli <csarven@status.net> | 2010-02-04 16:56:34 +0000 |
|---|---|---|
| committer | Sarven Capadisli <csarven@status.net> | 2010-02-04 16:56:34 +0000 |
| commit | 7ebd13fa69d2a5dac8bc59799281d3d6e017eeae (patch) | |
| tree | 605267bbe7c902d7a71766cdeb523bfbb266a0f9 /plugins/Realtime | |
| parent | 339eb1adadc7f3495ad31ef0a5cf20cdca47ce1f (diff) | |
| parent | 9e940445f1ab1ec53f3bad14a1a94dc2064d0ee6 (diff) | |
Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x
Diffstat (limited to 'plugins/Realtime')
| -rw-r--r-- | plugins/Realtime/RealtimePlugin.php | 4 | ||||
| -rw-r--r-- | plugins/Realtime/realtimeupdate.js | 4 |
2 files changed, 3 insertions, 5 deletions
diff --git a/plugins/Realtime/RealtimePlugin.php b/plugins/Realtime/RealtimePlugin.php index 16e28e94d..6c212453e 100644 --- a/plugins/Realtime/RealtimePlugin.php +++ b/plugins/Realtime/RealtimePlugin.php @@ -87,7 +87,7 @@ class RealtimePlugin extends Plugin $scripts = $this->_getScripts(); foreach ($scripts as $script) { - $action->script(common_path($script)); + $action->script($script); } $user = common_current_user(); @@ -307,7 +307,7 @@ class RealtimePlugin extends Plugin function _getScripts() { - return array('plugins/Realtime/realtimeupdate.js'); + return array(common_path('plugins/Realtime/realtimeupdate.js')); } function _updateInitialize($timeline, $user_id) diff --git a/plugins/Realtime/realtimeupdate.js b/plugins/Realtime/realtimeupdate.js index fb9dcdbfb..ab548958a 100644 --- a/plugins/Realtime/realtimeupdate.js +++ b/plugins/Realtime/realtimeupdate.js @@ -95,9 +95,7 @@ RealtimeUpdate = { $("#notices_primary .notice:first").css({display:"none"}); $("#notices_primary .notice:first").fadeIn(1000); - SN.U.FormXHR($('#'+noticeItemID+' .form_favor')); SN.U.NoticeReplyTo($('#'+noticeItemID)); - SN.U.FormXHR($('#'+noticeItemID+' .form_repeat')); SN.U.NoticeWithAttachment($('#'+noticeItemID)); }, @@ -180,7 +178,7 @@ console.log(data); ni = ni+"</div>"; - "</li>"; + ni = ni+"</li>"; return ni; }, |