From: Chip Black <bytex64@bytex64.net>
Date: Thu, 13 Jan 2011 12:24:29 +0000 (-0800)
Subject: Fix js to be consistent with b6235374b91ba7acf62c06c72de2f1291f46ac4c
X-Git-Tag: v1.0-ish~12
X-Git-Url: http://git.bytex64.net/?a=commitdiff_plain;h=972dcb8706dcedaf0460e23cc816f5eb1bbf7e96;hp=acfedd7b7e02875fdc6a85fdcb080771da24961d;p=blerg.git

Fix js to be consistent with b6235374b91ba7acf62c06c72de2f1291f46ac4c
---

diff --git a/www/js/blerg.js b/www/js/blerg.js
index 205c5a9..2415483 100644
--- a/www/js/blerg.js
+++ b/www/js/blerg.js
@@ -92,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', {
@@ -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>");
@@ -436,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();