projects
/
blerg.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add support for markdown-style headlines (lines beginning with #)
[blerg.git]
/
www
/
js
/
blerg.js
diff --git
a/www/js/blerg.js
b/www/js/blerg.js
index
25f1e94
..
d227a7a
100644
(file)
--- a/
www/js/blerg.js
+++ b/
www/js/blerg.js
@@
-5,7
+5,7
@@
// Config
var baseURL = '';
var recordTemplate = new Template(
// 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>
</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>'
);
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>'
@@
-111,8
+111,7
@@
LoginStatus.prototype.post = function(msg) {
qlink(this.username);
} else {
currentPager.itemCount++;
qlink(this.username);
} else {
currentPager.itemCount++;
- currentPager.pageStart = null;
- currentPager.loadItems();
+ currentPager.reload();
}
} else {
alert('Post failed!');
}
} else {
alert('Post failed!');
@@
-185,18
+184,29
@@
Pager.prototype.displayItems = function() {
document.body.scrollTo();
}
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 {
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) {
}
}
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));
+ }
}
}
@@
-234,7
+244,8
@@
function User(username) {
var j = r.responseText.evalJSON();
if (j) {
this.itemCount = parseInt(j.record_count);
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)
});
}
}.bind(this)
});
@@
-254,7
+265,7
@@
User.prototype.show = function() {
$('usercontrols').show();
}
$('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;
var url;
if (from != undefined && to != undefined) {
url = baseURL + '/get/' + this.username + '/' + from + '-' + to;
@@
-270,13
+281,14
@@
User.prototype.loadItems = function(from, to) {
if (records && records.length > 0) {
records.each(function(v) {
v.id = v.record;
if (records && records.length > 0) {
records.each(function(v) {
v.id = v.record;
+ v.author = this.username;
mangleRecord(v, recordTemplate);
mangleRecord(v, recordTemplate);
- });
+ }
.bind(this)
);
this.addItems(records);
if (!this.pageStart)
this.pageStart = records[0].recInt;
}
this.addItems(records);
if (!this.pageStart)
this.pageStart = records[0].recInt;
}
-
this.displayItems
();
+
continuation
();
}.bind(this),
onFailure: function(r) {
this.displayItems();
}.bind(this),
onFailure: function(r) {
this.displayItems();
@@
-329,8
+341,11
@@
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(/(\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');
+
+ // Remove backslashes from escaped metachars
+ l = l.replace(/\\([*\[\]])/g, '$1');
// 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>');
// 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>');
@@
-348,12
+363,12
@@
function mangleRecord(record, template) {
endpush = '</li>';
}
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) {
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 + '>';
}
out.push('<h' + depth + '>');
endpush = '</h' + depth + '>';
}
@@
-725,10
+740,8
@@
function hashSwitch() {
} else {
currentPager.showRecord(r);
}
} else {
currentPager.showRecord(r);
}
- } else {
- currentPager.pageStart = currentPager.itemCount - 1;
- currentPager.loadItems();
}
}
+ // Do nothing otherwise, the User constructor takes care of it
} else {
$$('[name=section]').each(function(v) { v.update('Welcome') });
$('signup').hide();
} else {
$$('[name=section]').each(function(v) { v.update('Welcome') });
$('signup').hide();