projects
/
blerg.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
(maybe) fix escaped metachars
[blerg.git]
/
www
/
js
/
blerg.js
diff --git
a/www/js/blerg.js
b/www/js/blerg.js
index
7203f09
..
3c4cc0e
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!');
@@
-181,19
+180,33
@@
Pager.prototype.displayItems = function() {
} else {
$('older_link').hide();
}
} else {
$('older_link').hide();
}
+
+ 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) {
}
Pager.prototype.showPageAt = function(r) {
- if (this.itemCache[r] && this.itemCache[r - 9]) {
+ var end = (r - 9 > 0 ? r - 9 : 0);
+ if (this.itemCache[r] && this.itemCache[end]) {
this.pageStart = r;
this.displayItems();
} else {
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));
+ }
}
}
@@
-231,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)
});
@@
-251,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;
@@
-267,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();
@@
-326,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|$)/g, '$1<b>$2</b>$3');
- l = l.replace(/(\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>');
@@
-414,6
+432,7
@@
function Tag(type, tag) {
});
this.addItems(j);
this.pageStart = j.length - 1;
});
this.addItems(j);
this.pageStart = j.length - 1;
+ this.itemCount = j.length;
}
this.displayItems();
}.bind(this),
}
this.displayItems();
}.bind(this),
@@
-445,6
+464,7
@@
Tag.prototype.show = function() {
// Pager for browsing subscription feeds
function Feed() {
this.initPager();
// Pager for browsing subscription feeds
function Feed() {
this.initPager();
+ this.username = loginStatus.username;
this.baseFrag = '/feed';
new Ajax.Request(baseURL + '/feed', {
this.baseFrag = '/feed';
new Ajax.Request(baseURL + '/feed', {
@@
-462,6
+482,7
@@
function Feed() {
});
this.addItems(response);
this.pageStart = response.length - 1;
});
this.addItems(response);
this.pageStart = response.length - 1;
+ this.itemCount = response.length;
}
this.displayItems();
}.bind(this),
}
this.displayItems();
}.bind(this),
@@
-648,7
+669,7
@@
function loadLatest() {
j.tags.each(function(v) {
var a = new Element('a', {href: '/#/tag/' + v});
a.insert('#' + v);
j.tags.each(function(v) {
var a = new Element('a', {href: '/#/tag/' + v});
a.insert('#' + v);
- a.onclick =
qlink
;
+ a.onclick =
"return qlink()"
;
a.className = 'ref';
$('latest-tags').insert(a);
$('latest-tags').appendChild(document.createTextNode(' '));
a.className = 'ref';
$('latest-tags').insert(a);
$('latest-tags').appendChild(document.createTextNode(' '));
@@
-685,18
+706,29
@@
function hashSwitch() {
if (m = location.search.match(/^\?post\/([^/]+)\/(.+)/)) {
$('post').show();
$('post.content').value = '[' + decodeURIComponent(m[1]).replace(']','').replace('[','') + '](' + decodeURIComponent(m[2]) + ')';
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)\/([A-Za-z0-9_-]+)$/)) {
- currentPager = new Tag(m[1], m[2]);
+ } else if (m = location.hash.match(/^#\/(ref|tag)\/([A-Za-z0-9_-]+)(?:\/p(\d+))?$/)) {
+ if (!currentPager || !(currentPager instanceof Tag) || currentPager.type != m[1] || currentPager.tag != m[2])
+ currentPager = new Tag(m[1], m[2]);
currentPager.show();
currentPager.show();
- } else if (m = location.hash.match(/^#\/feed/)) {
+
+ if (m[3]) {
+ var r = parseInt(m[3]);
+ currentPager.showPageAt(r);
+ }
+ } else if (m = location.hash.match(/^#\/feed(?:\/p(\d+))?$/)) {
if (loginStatus.loggedIn) {
if (loginStatus.loggedIn) {
- currentPager = new Feed();
+ if (!currentPager || !(currentPager instanceof Feed) || currentPager.username != loginStatus.username)
+ currentPager = new Feed();
currentPager.show();
currentPager.show();
+ if (m[3]) {
+ var r = parseInt(m[3]);
+ currentPager.showPageAt(r);
+ }
} else {
location.href = baseURL;
}
} else if (m = location.hash.match(/^#([A-Za-z0-9_-]+)(?:\/(p)?(\d+))?$/)) {
} else {
location.href = baseURL;
}
} else if (m = location.hash.match(/^#([A-Za-z0-9_-]+)(?:\/(p)?(\d+))?$/)) {
- if (!currentPager || currentPager.username != m[1])
+ if (!currentPager ||
!(currentPager instanceof User) ||
currentPager.username != m[1])
currentPager = new User(m[1]);
currentPager.show();
loginStatus.update();
currentPager = new User(m[1]);
currentPager.show();
loginStatus.update();
@@
-708,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();