X-Git-Url: http://git.bytex64.net/?a=blobdiff_plain;f=www%2Fjs%2Fblerg.js;h=eae9cbc387757d05d33a322f0b06998d18a4fe70;hb=d214c4d7d835a3f06925db9a7e2e6c42bc4d4346;hp=737d84cefc2759b2060469a237219d311b60c71d;hpb=f13f6cbe98cab2e170fb714047cd794fbd39e228;p=blerg.git

diff --git a/www/js/blerg.js b/www/js/blerg.js
index 737d84c..eae9cbc 100644
--- 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', {
@@ -104,7 +105,7 @@ LoginStatus.prototype.post = function(msg) {
             if (j && j.status == 'success') {
                 $('post.content').value = '';
                 if (location.hash != '#' + this.username) {
-                    location.hash = this.username;
+                    location.href = '/#' + this.username;
                     hashSwitch();
                 } else {
                     currentPager.itemCount++;
@@ -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;
 }
@@ -244,17 +244,21 @@ function mangleRecord(record, template) {
     record.recInt = parseInt(record.record);
 
     // Sanitize HTML input
-    record.data = record.data.replace('&', '&amp;').replace('<', '&lt;').replace('>', '&gt');
+    record.data = record.data.replace(/&/g, '&amp;').replace(/</g, '&lt;').replace(/>/g, '&gt;');
 
     // Turn HTTP URLs into links
-    record.data = record.data.replace(/(\s|^)(https?:\/\/[a-zA-Z0-9.-]*[a-zA-Z0-9](\/(\S*[^.!,;?()\s])?)?)/g, '$1<a href="$2">$2</a>');
+    record.data = record.data.replace(/(\s|^)(https?:\/\/[a-zA-Z0-9.-]*[a-zA-Z0-9](\/([^\s"]*[^.!,;?()\s])?)?)/g, '$1<a href="$2">$2</a>');
 
     // Turn markdown links into links
-    record.data = record.data.replace(/(\s|^)\[([^\]]+)\]\((https?:\/\/[a-zA-Z0-9.-]*[a-zA-Z0-9](\/[^)]*?)?)\)/, '$1<a href="$3">$2</a>');
+    record.data = record.data.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
+    record.data = record.data.replace(/(\s)\*\*([^*]+)\*\*(\s)/g, '$1<b>$2</b>$3');
+    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>");
@@ -353,7 +357,7 @@ function signup() {
         },
         onSuccess: function(r) {
             $('signup').hide();
-            location.hash = username;
+            location.href = '/#' + username;
             hashSwitch();
 
             loginStatus.login(username, password);
@@ -398,15 +402,41 @@ 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\/([^/]+)\/(.+)/)) {
         $('post').show();
         $('post.content').value = '[' + decodeURIComponent(m[1]).replace(']','').replace('[','') + '](' + decodeURIComponent(m[2]) + ')';
-    } else if (m = location.hash.match(/^#(ref|tag)\/(\w+)$/)) {
+    } else if (m = location.hash.match(/^#(ref|tag)\/([A-Za-z0-9_-]+)$/)) {
         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();
@@ -433,6 +463,7 @@ function hashSwitch() {
         $('older_link').hide();
         $('welcome').show();
         $('rss').hide();
+        loadNewThings();
     }
 }