projects
/
blerg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
acfedd7
)
Fix js to be consistent with b6235374b91ba7acf62c06c72de2f1291f46ac4c
author
Chip Black
<bytex64@bytex64.net>
Thu, 13 Jan 2011 12:24:29 +0000
(
04:24
-0800)
committer
Chip Black
<bytex64@bytex64.net>
Mon, 17 Jan 2011 09:38:37 +0000
(
01:38
-0800)
www/js/blerg.js
patch
|
blob
|
history
diff --git
a/www/js/blerg.js
b/www/js/blerg.js
index
205c5a9
..
2415483
100644
(file)
--- 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!");
LoginStatus.prototype.post = function(msg) {
if (!this.loggedIn) {
alert("You are not logged in!");
-
exit(0)
;
+
return
;
}
new Ajax.Request(baseURL + '/put', {
}
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)\*([^*]+)\*(\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>");
// 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(/^#(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();
if (!currentPager || currentPager.username != m[1])
currentPager = new User(m[1]);
currentPager.show();