X-Git-Url: http://git.bytex64.net/?a=blobdiff_plain;f=www%2Fjs%2Fblerg.js;h=38e3f721f849365d44a8ac6af9946da892617d0c;hb=88c6a9fc4bb0ed732cc7aaac463b71d1afd235cf;hp=1f413ad3a240de0d8dc8a3f2b83ea51b4a7d2c68;hpb=db45aeacb003f72b853abbccd6f722770732438b;p=blerg.git
diff --git a/www/js/blerg.js b/www/js/blerg.js
index 1f413ad..38e3f72 100644
--- a/www/js/blerg.js
+++ b/www/js/blerg.js
@@ -8,10 +8,10 @@ var recordTemplate = new Template(
''
);
var tagRecordTemplate = new Template(
- ''
+ ''
);
var latestRecordsTemplate = new Template(
- ''
+ ''
);
// Page elements
@@ -82,7 +82,7 @@ LoginStatus.prototype.update = function() {
if (this.loggedIn) {
$('userlink').href = '/#' + this.username;
$('userlink').update('@' + this.username);
- $('reflink').href = '/#ref/' + this.username;
+ $('reflink').href = '/#/ref/' + this.username;
$('login').hide();
$('logout').show();
} else {
@@ -108,8 +108,7 @@ LoginStatus.prototype.post = function(msg) {
if (j && j.status == 'success') {
$('post.content').value = '';
if (location.hash != '#' + this.username) {
- location.href = '/#' + this.username;
- hashSwitch();
+ qlink(this.username);
} else {
currentPager.itemCount++;
currentPager.pageStart = null;
@@ -138,15 +137,13 @@ Pager.prototype.initPager = function() {
Pager.prototype.olderPage = function() {
if (this.pageStart >= this.itemsPerPage) {
- this.pageStart -= this.itemsPerPage;
- this.displayItems();
+ qlink(this.baseFrag + '/p' + (this.pageStart - this.itemsPerPage));
}
}
Pager.prototype.newerPage = function() {
if (this.pageStart + this.itemsPerPage < this.itemCount) {
- this.pageStart += this.itemsPerPage;
- this.displayItems();
+ qlink(this.baseFrag + '/p' + (this.pageStart + this.itemsPerPage));
}
}
@@ -171,15 +168,32 @@ Pager.prototype.displayItems = function() {
items.insert("There doesn't seem to be anything here!");
}
- if (this.pageStart < this.itemCount - 1)
+ if (this.pageStart < this.itemCount - 1) {
+ $('newer_link').href = '/#' + this.baseFrag + '/p' + (this.pageStart + this.itemsPerPage);
$('newer_link').show();
- else
+ } else {
$('newer_link').hide();
+ }
- if (this.pageStart >= 10)
+ if (this.pageStart >= 10) {
+ $('older_link').href = '/#' + this.baseFrag + '/p' + (this.pageStart - this.itemsPerPage);
$('older_link').show();
- else
+ } else {
$('older_link').hide();
+ }
+}
+
+Pager.prototype.showPageAt = function(r) {
+ if (this.itemCache[r] && this.itemCache[r - 9]) {
+ this.pageStart = r;
+ this.displayItems();
+ } else {
+ this.loadItems((r >= 49 ? r - 49 : 0), r);
+ }
+}
+
+Pager.prototype.showRecord = function(r) {
+ this.showPageAt(r);
}
@@ -187,6 +201,29 @@ Pager.prototype.displayItems = function() {
function User(username) {
this.initPager();
this.username = username;
+ this.baseFrag = username;
+
+ $$('[name=user.subscribelink]').each(Element.hide);
+ $$('[name=user.unsubscribelink]').each(Element.hide);
+
+ if (loginStatus.loggedIn) {
+ new Ajax.Request(baseURL + '/feedinfo/' + username, {
+ method: 'post',
+ parameters: {
+ username: loginStatus.username
+ },
+ onSuccess: function(r) {
+ var json = r.responseText.evalJSON();
+ if (json.subscribed) {
+ $$('[name=user.subscribelink]').each(Element.hide);
+ $$('[name=user.unsubscribelink]').each(Element.show);
+ } else {
+ $$('[name=user.subscribelink]').each(Element.show);
+ $$('[name=user.unsubscribelink]').each(Element.hide);
+ }
+ }
+ });
+ }
new Ajax.Request(baseURL + '/info/' + username, {
method: 'get',
@@ -209,7 +246,7 @@ User.prototype.show = function() {
$('rss').show();
$('rsslink').href = '/rss/' + this.username;
$$('[name=user.reflink]').each(function(e) {
- e.href = '/#ref/' + this.username;
+ e.href = '/#/ref/' + this.username;
}.bind(this));
$('usercontrols').show();
}
@@ -250,26 +287,89 @@ User.prototype.loadItems = function(from, to) {
function mangleRecord(record, template) {
record.recInt = parseInt(record.record);
- // Sanitize HTML input
- record.data = record.data.replace(/&/g, '&').replace(//g, '>');
+ var lines = record.data.split(/\r?\n/);
+ if (lines[lines.length - 1] == '')
+ lines.pop();
+
+ var out = [''];
+ var endpush = null;
+ var listMode = false;
+ lines.each(function(l) {
+ if (l == '') {
+ if (out[out.length - 1] == '
') {
+ out[out.length - 1] = '
';
+ }
+ if (out[out.length - 1] == '') {
+ out.push('');
+ out.push('
');
+ listMode = false;
+ }
+ return;
+ }
- // Turn HTTP URLs into links
- record.data = record.data.replace(/(\s|^)(https?:\/\/[a-zA-Z0-9.-]*[a-zA-Z0-9](\/([^\s"]*[^.!,;?()\s])?)?)/g, '$1$2');
+ // Put quoted material into a special paragraph
+ if (l[0] == '>') {
+ var pi = out.lastIndexOf('
');
+ if (pi != -1) {
+ out[pi] = '
';
+ l = l.replace(/^>\s*/, '');
+ }
+ }
+
+ // Sanitize HTML input
+ l = l.replace(/&/g, '&').replace(//g, '>');
+
+ // Turn HTTP URLs into links
+ l = l.replace(/(\s|^)(https?:\/\/[a-zA-Z0-9.-]*[a-zA-Z0-9](\/([^\s"]*[^.!,;?()\s])?)?)/g, '$1$2');
- // Turn markdown links into links
- record.data = record.data.replace(/(\s|^)\[([^\]]+)\]\((https?:\/\/[a-zA-Z0-9.-]*[a-zA-Z0-9](\/[^)"]*?)?)\)/g, '$1$2');
+ // Turn markdown links into links
+ l = l.replace(/(\s|^)\[([^\]]+)\]\((https?:\/\/[a-zA-Z0-9.-]*[a-zA-Z0-9](\/[^)"]*?)?)\)/g, '$1$2');
- // Turn *foo* into italics and **foo** into bold
- record.data = record.data.replace(/(\s)\*\*([^*]+)\*\*(\s)/g, '$1$2$3');
- record.data = record.data.replace(/(\s)\*([^*]+)\*(\s)/g, '$1$2$3');
+ // Turn *foo* into italics and **foo** into bold
+ l = l.replace(/(\W|^)\*\*(\w[^*]*)\*\*(\W|$)/g, '$1$2$3');
+ l = l.replace(/(\W|^)\*(\w[^*]*)\*(\W|$)/g, '$1$2$3');
+
+ // Turn refs and tags into links
+ l = l.replace(/(\s|^)#([A-Za-z0-9_-]+)/g, '$1#$2');
+ l = l.replace(/(\s|^)@([A-Za-z0-9_-]+)/g, '$1@$2');
+
+ // Create lists when lines begin with *
+ if (l[0] == '*') {
+ if (!listMode) {
+ var pi = out.lastIndexOf('
');
+ out[pi] = '
';
+ listMode = true;
+ }
+ l = l.replace(/^\*\s*/, '');
+ out.push('- ');
+ endpush = '
';
+ }
- // Turn refs and tags into links
- record.data = record.data.replace(/(\s|^)#([A-Za-z0-9_-]+)/g, '$1#$2');
- record.data = record.data.replace(/(\s|^)@([A-Za-z0-9_-]+)/g, '$1@$2');
+ // Create headers when lines begin with =
+ if (l[0] == '=') {
+ var m = l.match(/^(=+)/);
+ var depth = m[1].length;
+ if (depth <= 5) {
+ l = l.replace(/^=+\s*/, '').replace(/\s*=+$/, '');
+ out.push('');
+ endpush = '';
+ }
+ }
- // Turn newlines into linebreaks and paragraphs
- record.data = record.data.replace(/\r?\n\r?\n/g, "").replace(/\r?\n/g, "
");
+ out.push(l);
+ if (endpush) {
+ out.push(endpush);
+ endpush = null;
+ } else {
+ out.push('
');
+ }
+ });
+ while (out[out.length - 1] == '
' || out[out.length - 1] == '
')
+ out.pop();
+ if (listMode)
+ out.push('
');
+ record.data = out.join('');
record.date = (new Date(record.timestamp * 1000)).toString();
record.html = template.evaluate(record);
}
@@ -290,9 +390,11 @@ function Tag(type, tag) {
case 'tag':
//url += '%23';
url += 'H'; // apache is eating the hash, even encoded. Probably a security feature.
+ this.baseFrag = '/tag/' + tag;
break;
case 'ref':
url += '%40';
+ this.baseFrag = '/ref/' + tag;
break;
default:
alert('Invalid tag type: ' + type);
@@ -339,6 +441,52 @@ Tag.prototype.show = function() {
$('usercontrols').hide();
}
+
+// Pager for browsing subscription feeds
+function Feed() {
+ this.initPager();
+ this.baseFrag = '/feed';
+
+ new Ajax.Request(baseURL + '/feed', {
+ method: 'post',
+ parameters: {
+ username: loginStatus.username
+ },
+ onSuccess: function(r) {
+ var response = r.responseText.evalJSON();
+ if (response) {
+ var maxid = response.length - 1;
+ response.each(function(v, i) {
+ v.id = maxid - i;
+ mangleRecord(v, tagRecordTemplate)
+ });
+ this.addItems(response);
+ this.pageStart = response.length - 1;
+ }
+ this.displayItems();
+ }.bind(this),
+ onFailure: function(r) {
+ this.displayItems();
+ }.bind(this)
+ });
+}
+Feed.prototype = new Pager();
+Feed.prototype.constructor = Feed;
+
+Feed.prototype.show = function() {
+ $$('[name=section]').each(function(v) {
+ v.update(' ' + loginStatus.username + "'s spycam");
+ }.bind(this));
+ $('welcome').hide();
+ $('post').hide();
+ $('older_link').hide();
+ $('newer_link').hide();
+ $('rss').hide();
+ items.show();
+ $('usercontrols').hide();
+}
+
+
function postPopup() {
if (loginStatus.loggedIn) {
var post = $('post');
@@ -365,8 +513,7 @@ function signup() {
},
onSuccess: function(r) {
$('signup').hide();
- location.href = '/#' + username;
- hashSwitch();
+ qlink(username);
loginStatus.login(username, password);
},
@@ -381,14 +528,48 @@ function signup_cancel() {
hashSwitch();
}
-function newer_page() {
- if (currentPager)
- currentPager.newerPage();
+function subscribe() {
+ new Ajax.Request(baseURL + '/subscribe/' + currentPager.username, {
+ method: 'post',
+ parameters: {
+ username: loginStatus.username
+ },
+ onSuccess: function(r) {
+ var response = r.responseText.evalJSON();
+ if (response.status == 'success') {
+ alert("You call " + currentPager.username + " and begin breathing heavily into the handset.");
+ $$('[name=user.subscribelink]').each(Element.hide);
+ $$('[name=user.unsubscribelink]').each(Element.show);
+ } else {
+ alert('Failed to subscribe. This is probably for the best');
+ }
+ },
+ onFailure: function(r) {
+ alert('Failed to subscribe. This is probably for the best');
+ }
+ });
}
-function older_page() {
- if (currentPager)
- currentPager.olderPage();
+function unsubscribe() {
+ new Ajax.Request(baseURL + '/unsubscribe/' + currentPager.username, {
+ method: 'post',
+ parameters: {
+ username: loginStatus.username
+ },
+ onSuccess: function(r) {
+ var response = r.responseText.evalJSON();
+ if (response.status == 'success') {
+ alert("You come to your senses.");
+ $$('[name=user.subscribelink]').each(Element.show);
+ $$('[name=user.unsubscribelink]').each(Element.hide);
+ } else {
+ alert('You are unable to tear yourself away (because something failed on the server)');
+ }
+ },
+ onFailure: function(r) {
+ alert('You are unable to tear yourself away (because something failed on the server)');
+ }
+ });
}
var resizePostContentTimeout = null;
@@ -425,9 +606,6 @@ function tickerFader(a, b, p) {
b.hide();
}
-function fadeOut(p) {
-}
-
function ticker() {
tickerHead.show();
Bytex64.FX.run(tickerFader.curry(tickerHead, tickerTail), 0.5);
@@ -447,7 +625,7 @@ function startTicker() {
// Show the first five
tickerHead = $('latest-posts').firstChild;
- for (var i = 0; i < 5 && tickerHead; i++) {
+ for (var i = 0; i < 10 && tickerHead; i++) {
tickerHead.show();
tickerHead = tickerHead.nextSibling;
}
@@ -468,8 +646,10 @@ function loadLatest() {
$('latest-tags').update();
j.tags.each(function(v) {
- var a = new Element('a', {href: '/#tag/' + v});
+ var a = new Element('a', {href: '/#/tag/' + v});
a.insert('#' + v);
+ a.onclick = qlink;
+ a.className = 'ref';
$('latest-tags').insert(a);
$('latest-tags').appendChild(document.createTextNode(' '));
});
@@ -486,16 +666,36 @@ function loadLatest() {
});
}
+function qlink(loc) {
+ if (loc) {
+ location.hash = loc;
+ } else if (event && event.target) {
+ location.href = event.target.href;
+ } else {
+ // Bogus qlink
+ return;
+ }
+ hashSwitch();
+ return false;
+}
+
function hashSwitch() {
var m;
stopTicker();
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_-]+)$/)) {
+ } 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(/^#([A-Za-z0-9_-]+)(:(\d+))?$/)) {
+ } else if (m = location.hash.match(/^#\/feed/)) {
+ if (loginStatus.loggedIn) {
+ currentPager = new Feed();
+ currentPager.show();
+ } else {
+ location.href = baseURL;
+ }
+ } else if (m = location.hash.match(/^#([A-Za-z0-9_-]+)(?:\/(p)?(\d+))?$/)) {
if (!currentPager || currentPager.username != m[1])
currentPager = new User(m[1]);
currentPager.show();
@@ -503,11 +703,10 @@ function hashSwitch() {
if (m[3]) {
var r = parseInt(m[3]);
- currentPager.showRecord = r;
- if (currentPager.recordCache[r]) {
- currentPager.displayItems();
+ if (m[2] == 'p') {
+ currentPager.showPageAt(r);
} else {
- currentPager.loadItems((r >= 49 ? r - 49 : 0), r);
+ currentPager.showRecord(r);
}
} else {
currentPager.pageStart = currentPager.itemCount - 1;
@@ -545,7 +744,7 @@ function init() {
setInterval(hashCheck, 250);
document.body.observe('keyup', function(event) {
- if (event.shiftKey && event.keyCode == '32') {
+ if (event.shiftKey && event.keyCode == 32) {
postPopup();
event.stop();
}