Fix js to be consistent with b6235374b91ba7acf62c06c72de2f1291f46ac4c

[blerg.git] / www / js / blerg.js

diff --git a/www/js/blerg.js b/www/js/blerg.js
index 4d56790..2415483 100644 (file)
--- a/www/js/blerg.js
+++ b/www/js/blerg.js
@@ -79,6 +79,7 @@ LoginStatus.prototype.update = function() {
     if (this.loggedIn) {
         $('userlink').href = '/#' + this.username;
         $('userlink').update('@' + this.username);
+        $('reflink').href = '/#ref/' + this.username;
         $('login').hide();
         $('logout').show();
     } else {
@@ -91,7 +92,7 @@ LoginStatus.prototype.update = function() {
 LoginStatus.prototype.post = function(msg) {
     if (!this.loggedIn) {
         alert("You are not logged in!");
-        exit(0);
+        return;
     }
 
     new Ajax.Request(baseURL + '/put', {
@@ -202,7 +203,6 @@ User.prototype.show = function() {
     $$('[name=section]').each(function(v) { v.update(' @' + this.username) }.bind(this));
     $('welcome').hide();
     items.show();
-    $('reflink').href = '/#ref/' + this.username;
     $('rss').show();
     $('rsslink').href = '/rss/' + this.username;
 }
@@ -257,8 +257,8 @@ function mangleRecord(record, template) {
     record.data = record.data.replace(/(\s)\*([^*]+)\*(\s)/g, '$1<i>$2</i>$3');
 
     // Turn refs and tags into links
-    record.data = record.data.replace(/(\s|^)#(\w+)/g, '$1<a href="#tag/$2">#$2</a>');
-    record.data = record.data.replace(/(\s|^)@(\w+)/g, '$1<a href="#$2">@$2</a>');
+    record.data = record.data.replace(/(\s|^)#([A-Za-z0-9_-]+)/g, '$1<a href="#tag/$2">#$2</a>');
+    record.data = record.data.replace(/(\s|^)@([A-Za-z0-9_-]+)/g, '$1<a href="#$2">@$2</a>');
 
     // Turn newlines into linebreaks and paragraphs
     record.data = record.data.replace(/\r?\n\r?\n/g, "<p>").replace(/\r?\n/g, "<br>");
@@ -402,6 +402,32 @@ function resizePostContent() {
     }, 150);
 }
 
+function loadNewThings() {
+    new Ajax.Request(baseURL + '/newtags.json', {
+        onSuccess: function(r) {
+            $('newtags').update();
+            r.responseText.evalJSON().each(function(v) {
+                var a = new Element('a', {href: '/#tag/' + v});
+                a.insert('#' + v);
+                $('newtags').insert(a);
+                $('newtags').insert(new Element('br'));
+            });
+        }
+    });
+
+    new Ajax.Request(baseURL + '/newusers.json', {
+        onSuccess: function(r) {
+            $('newusers').update();
+            r.responseText.evalJSON().each(function(v) {
+                var a = new Element('a', {href: '/#' + v});
+                a.insert('@' + v);
+                $('newusers').insert(a);
+                $('newusers').insert(new Element('br'));
+            });
+        }
+    });
+}
+
 function hashSwitch() {
     var m;
     if (m = location.search.match(/^\?post\/([^/]+)\/(.+)/)) {
@@ -410,7 +436,7 @@ function hashSwitch() {
     } else if (m = location.hash.match(/^#(ref|tag)\/(\w+)$/)) {
         currentPager = new Tag(m[1], m[2]);
         currentPager.show();
-    } else if (m = location.hash.match(/^#(\w+)(:(\d+))?$/)) {
+    } else if (m = location.hash.match(/^#([A-Za-z0-9_-]+)(:(\d+))?$/)) {
         if (!currentPager || currentPager.username != m[1])
             currentPager = new User(m[1]);
         currentPager.show();
@@ -437,6 +463,7 @@ function hashSwitch() {
         $('older_link').hide();
         $('welcome').show();
         $('rss').hide();
+        loadNewThings();
     }
 }