Using util.js to set onclick reply anchor

diff --git a/js/util.js b/js/util.js
index de486cf7405b2be54349e3ec0096274ae1b2e3ac..6ca5f8cbca5d5879aa359aeac24110a6b51f58bb 100644 (file)
--- a/js/util.js
+++ b/js/util.js
@@ -176,6 +176,7 @@ $(document).ready(function(){
                                                                                                        counter();
                                                                                                        $("#notices_primary .notice:first").css({display:"none"});
                                                                                                        $("#notices_primary .notice:first").fadeIn(2500);
+                                                                                                       NoticeHover();
                                                                                                }
                                                                                                $("#notice_action-submit").removeAttr("disabled");
                                                                                                $("#notice_action-submit").removeClass("disabled");
@@ -184,6 +185,19 @@ $(document).ready(function(){
        $("#form_notice").ajaxForm(PostNotice);
        $("#form_notice").each(addAjaxHidden);
 
+    NoticeHover();
+
+    $('#content .notice').each(function() {
+        var notice = $(this);
+        $('.notice_reply', $(this)).click(function() {
+            var nickname = ($('.author .nickname', notice).length > 0) ? $('.author .nickname', notice) : $('.author .nickname');
+            NoticeReply(nickname.text(), $('.notice_id', notice).text());
+            return false;
+        });
+    });
+});
+
+function NoticeHover() {
     $("#content .notice").hover(
         function () {
             $(this).addClass('hover');
@@ -192,9 +206,9 @@ $(document).ready(function(){
             $(this).removeClass('hover');
         }
     );
-});
+}
 
-function doreply(nick,id) {
+function NoticeReply(nick,id) {
        rgx_username = /^[0-9a-zA-Z\-_.]*$/;
        if (nick.match(rgx_username)) {
                replyto = "@" + nick + " ";

diff --git a/lib/noticelist.php b/lib/noticelist.php
index 07912c552dd345ae9c2cd630ade76d9ec187e35c..8b0c5f3226cc459dd43bd24f166c93d1d02377bf 100644 (file)
--- a/lib/noticelist.php
+++ b/lib/noticelist.php
@@ -22,6 +22,7 @@
  * @category  UI
  * @package   Laconica
  * @author    Evan Prodromou <evan@controlyourself.ca>
+ * @author    Sarven Capadisli <csarven@controlyourself.ca>
  * @copyright 2008 Control Yourself, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link      http://laconi.ca/
@@ -440,8 +441,11 @@ class NoticeListItem extends Widget
         $this->out->elementStart('dl', 'notice_reply');
         $this->out->element('dt', null, _('Reply to this notice'));
         $this->out->elementStart('dd');
-        $this->out->element('a', array('href' => $reply_url,
-                                       'title' => _('Reply to this notice')), _('Reply'));
+        $this->out->elementStart('a', array('href' => $reply_url,
+                                       'title' => _('Reply to this notice')));
+        $this->out->text(_('Reply'));
+        $this->out->element('span', 'notice_id', $this->notice->id);
+        $this->out->elementEnd('a');
         $this->out->elementEnd('dd');
         $this->out->elementEnd('dl');
     }