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

diff --git a/www/js/blerg.js b/www/js/blerg.js
index 25f1e94..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}</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}</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>'
@@ -111,8 +111,7 @@ LoginStatus.prototype.post = function(msg) {
                     qlink(this.username);
                 } else {
                     currentPager.itemCount++;
-                    currentPager.pageStart = null;
-                    currentPager.loadItems();
+                    currentPager.reload();
                 }
             } else {
                 alert('Post failed!');
@@ -185,32 +184,63 @@ Pager.prototype.displayItems = function() {
     document.body.scrollTo();
 }
 
+Pager.prototype.reload = function() {
+    this.pageStart = null;
+    this.loadItems(null, null, Pager.prototype.showPageAt.bind(this, this.itemCount - 1));
+}
+
 Pager.prototype.showPageAt = function(r) {
     var end = (r - 9 > 0 ? r - 9 : 0);
     if (this.itemCache[r] && this.itemCache[end]) {
         this.pageStart = r;
         this.displayItems();
     } else {
-        this.loadItems((r >= 49 ? r - 49 : 0), r);
+        this.loadItems((r >= 49 ? r - 49 : 0), r, Pager.prototype.showPageAt.bind(this, r));
     }
 }
 
 Pager.prototype.showRecord = function(r) {
-    this.showPageAt(r);
+    if (this.itemCache[r]) {
+        $('older_link').hide();
+        $('newer_link').hide();
+        items.update(this.itemCache[r].html);
+    } else {
+        this.loadItems(r, r, Pager.prototype.showRecord.bind(this, r));
+    }
 }
 
+Pager.prototype.loadItems = function(from, to, continuation) { }
+
 
 // Object to render user pages
 function User(username) {
     this.initPager();
     this.username = username;
     this.baseFrag = username;
+}
+User.prototype = new Pager();
+User.prototype.constructor = User;
+
+User.prototype.show = function() {
+    $$('[name=section]').each(function(v) { v.update(' @' + this.username) }.bind(this));
+    $('welcome').hide();
+    items.show();
+    $('rss').show();
+    $('rsslink').href = '/rss/' + this.username;
+    $$('[name=user.reflink]').each(function(e) {
+        e.href = '/#/ref/' + this.username;
+    }.bind(this));
+    $('usercontrols').show();
+}
+
+User.prototype.reload = function() {
+    this.pageStart = null;
 
     $$('[name=user.subscribelink]').each(Element.hide);
     $$('[name=user.unsubscribelink]').each(Element.hide);
 
     if (loginStatus.loggedIn) {
-        new Ajax.Request(baseURL + '/feedinfo/' + username, {
+        new Ajax.Request(baseURL + '/feedinfo/' + this.username, {
             method: 'post',
             parameters: {
                 username: loginStatus.username
@@ -228,33 +258,20 @@ function User(username) {
         });
     }
 
-    new Ajax.Request(baseURL + '/info/' + username, {
+    new Ajax.Request(baseURL + '/info/' + this.username, {
         method: 'get',
         onSuccess: function(r) {
             var j = r.responseText.evalJSON();
             if (j) {
                 this.itemCount = parseInt(j.record_count);
-                this.displayItems();
+                if (!this.pageStart)
+                    this.showPageAt(this.itemCount - 1);
             }
         }.bind(this)
     });
 }
-User.prototype = new Pager();
-User.prototype.constructor = User;
 
-User.prototype.show = function() {
-    $$('[name=section]').each(function(v) { v.update(' @' + this.username) }.bind(this));
-    $('welcome').hide();
-    items.show();
-    $('rss').show();
-    $('rsslink').href = '/rss/' + this.username;
-    $$('[name=user.reflink]').each(function(e) {
-        e.href = '/#/ref/' + this.username;
-    }.bind(this));
-    $('usercontrols').show();
-}
-
-User.prototype.loadItems = function(from, to) {
+User.prototype.loadItems = function(from, to, continuation) {
     var url;
     if (from != undefined && to != undefined) {
         url = baseURL + '/get/' + this.username + '/' + from + '-' + to;
@@ -270,13 +287,14 @@ User.prototype.loadItems = function(from, to) {
             if (records && records.length > 0) {
                 records.each(function(v) {
                     v.id = v.record;
+                    v.author = this.username;
                     mangleRecord(v, recordTemplate);
-                });
+                }.bind(this));
                 this.addItems(records);
                 if (!this.pageStart)
                     this.pageStart = records[0].recInt;
             }
-            this.displayItems();
+            continuation();
         }.bind(this),
         onFailure: function(r) {
             this.displayItems();
@@ -329,12 +347,12 @@ function mangleRecord(record, template) {
         l = l.replace(/(\s|^)\[([^\]]+)\]\((https?:\/\/[a-zA-Z0-9.-]*[a-zA-Z0-9](\/[^)"]*?)?)\)/g, '$1<a href="$3">$2</a>');
 
         // Turn *foo* into italics and **foo** into bold
-        l = l.replace(/(\W|^)\*\*(\w[^*]*)\*\*(\W|$)/g, '$1<b>$2</b>$3');
-        l = l.replace(/(\W|^)\*(\w[^*]*)\*(\W|$)/g, '$1<i>$2</i>$3');
+        l = l.replace(/([^\w\\]|^)\*\*(\w[^*]*)\*\*(\W|$)/g, '$1<b>$2</b>$3');
+        l = l.replace(/([^\w\\]|^)\*(\w[^*]*)\*(\W|$)/g, '$1<i>$2</i>$3');
 
         // 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] == '*') {
@@ -348,17 +366,20 @@ function mangleRecord(record, template) {
             endpush = '</li>';
         }
 
-        // Create headers when lines begin with =
-        if (l[0] == '=') {
-            var m = l.match(/^(=+)/);
+        // Create headers when lines begin with = or #
+        if (l[0] == '=' || l[0] == '#') {
+            var m = l.match(/^([=#]+)/);
             var depth = m[1].length;
             if (depth <= 5) {
-                l = l.replace(/^=+\s*/, '').replace(/\s*=+$/, '');
+                l = l.replace(/^[=#]+\s*/, '').replace(/\s*[=#]+$/, '');
                 out.push('<h' + depth + '>');
                 endpush = '</h' + depth + '>';
             }
         }
 
+        // Remove backslashes from escaped metachars
+        l = l.replace(/\\([*\[\]@#])/g, '$1');
+
         out.push(l);
         if (endpush) {
             out.push(endpush);
@@ -493,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();
@@ -699,6 +722,8 @@ function hashSwitch() {
         if (m[3]) {
             var r = parseInt(m[3]);
             currentPager.showPageAt(r);
+        } else {
+            currentPager.showPageAt(currentPager.itemCount - 1);
         }
     } else if (m = location.hash.match(/^#\/feed(?:\/p(\d+))?$/)) {
         if (loginStatus.loggedIn) {
@@ -708,6 +733,8 @@ function hashSwitch() {
             if (m[3]) {
                 var r = parseInt(m[3]);
                 currentPager.showPageAt(r);
+            } else {
+                currentPager.showPageAt(currentPager.itemCount - 1);
             }
         } else {
             location.href = baseURL;
@@ -726,8 +753,7 @@ function hashSwitch() {
                 currentPager.showRecord(r);
             }
         } else {
-            currentPager.pageStart = currentPager.itemCount - 1;
-            currentPager.loadItems();
+            currentPager.reload();
         }
     } else {
         $$('[name=section]').each(function(v) { v.update('Welcome') });