X-Git-Url: http://git.bytex64.net/?a=blobdiff_plain;f=www%2Fjs%2Fblerg.js;h=b882dd9944425567d01f6844138216e8955978d0;hb=e5ddf802919d8f9d123d02b14602a98168c7bf6f;hp=944f112634cbe70f12e81cce6e824ca0d53cc75c;hpb=3f2f34bd763a1f3e1da52a0ca0e66ca4daacc1ca;p=blerg.git

diff --git a/www/js/blerg.js b/www/js/blerg.js
index 944f112..b882dd9 100644
--- a/www/js/blerg.js
+++ b/www/js/blerg.js
@@ -5,10 +5,10 @@
 // Config
 var baseURL = '';
 var recordTemplate = new Template(
-    '<div class="record">#{data}<div class="info">Posted #{date}. <a href="/\##{author}/#{record}">[permalink]</a></div></div>'
+    '<div class="record">#{data}<div class="info">Posted #{date}. <a href="/\##{author}/#{record}">[permalink]</a> <a href="#" onclick="postPopup(\'@#{author}/#{record}: \'); return false">[reply]</a></div></div>'
 );
 var tagRecordTemplate = new Template(
-    '<div class="record">#{data}<div class="info">Posted by <a class="author ref" href="/\##{author}" onclick="return qlink()">@#{author}</a> on #{date}. <a href="/\##{author}/#{record}">[permalink]</a></div></div>'
+    '<div class="record">#{data}<div class="info">Posted by <a class="author ref" href="/\##{author}" onclick="return qlink()">@#{author}</a> on #{date}. <a href="/\##{author}/#{record}">[permalink]</a> <a href="#" onclick="postPopup(\'@#{author}/#{record}: \'); return false">[reply]</a></div></div>'
 );
 var latestRecordsTemplate = new Template(
     '<div class="record"><a class="author ref" href="/\##{author}" onclick="return qlink()">@#{author}</a> #{data}</div>'
@@ -352,7 +352,7 @@ function mangleRecord(record, template) {
 
         // Turn refs and tags into links
         l = l.replace(/(\s|^)#([A-Za-z0-9_-]+)/g, '$1<a href="#/tag/$2" class="ref" onclick="return qlink()">#$2</a>');
-        l = l.replace(/(\s|^)@([A-Za-z0-9_-]+)/g, '$1<a href="#$2" class="ref" onclick="return qlink()">@$2</a>');
+        l = l.replace(/(\s|^)@([A-Za-z0-9_-]+)(\/\d+)?/g, '$1<a href="#$2$3" class="ref" onclick="return qlink()">@$2</a>');
 
         // Create lists when lines begin with *
         if (l[0] == '*') {
@@ -514,14 +514,16 @@ Feed.prototype.show = function() {
 }
 
 
-function postPopup() {
-    if (loginStatus.loggedIn) {
+function postPopup(initial) {
+    if (loginStatus.loggedIn || initial) {
         var post = $('post');
         if (post.visible()) {
             post.hide();
         } else {
             post.show();
-            if (currentPager.username && currentPager.username != loginStatus.username && !$('post.content').value) {
+            if (initial) {
+                $('post.content').value = initial;
+            } else if (!$('post.content').value && currentPager.username && currentPager.username != loginStatus.username) {
                 $('post.content').value = '@' + currentPager.username + ': ';
             }
             $('post.content').focus();