Add User, port simplified paging
Add User to handle user pages. Rework paging to simply append older items;
damn the memory cost. Move postMangle to a Util class.
});
}
-function mangleRecord(record, template) {
- record.recInt = parseInt(record.record);
-
- var lines = record.data.split(/\r?\n/);
- if (lines[lines.length - 1] == '')
- lines.pop();
-
- var out = ['<p>'];
- var endpush = null;
- var listMode = false;
- lines.each(function(l) {
- if (l == '') {
- if (out[out.length - 1] == '<br>') {
- out[out.length - 1] = '<p>';
- }
- if (out[out.length - 1] == '</li>') {
- out.push('</ul>');
- out.push('<p>');
- listMode = false;
- }
- return;
- }
-
- // Put quoted material into a special paragraph
- if (l[0] == '>') {
- var pi = out.lastIndexOf('<p>');
- if (pi != -1) {
- out[pi] = '<p class="quote">';
- l = l.replace(/^>\s*/, '');
- }
- }
-
- // Sanitize HTML input
- l = l.replace(/&/g, '&').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<a href="$2">$2</a>');
-
- // Turn markdown links into links
- var re;
-
- // Craft a regex that finds URLs that end in the extensions specified by BlergMedia.audioExtensions.
- re = new RegExp('(\\s|^)\\[([^\\]]+)\\]\\((https?:\\/\\/[a-zA-Z0-9.-]*[a-zA-Z0-9]\\/[^)"]*?\\.(' + BlergMedia.audioExtensions.join('|') + '))\\)', 'g');
- l = l.replace(re, '$1<a href="$3">$2</a> <a href="$3" onclick="play_audio(); return false"><img src="/images/play.png"></a>');
-
- // Ditto, but use the extended markdown link syntax to specify the format
- re = new RegExp('(\\s|^)\\[([^\\]]+)\\]\\((https?:\\/\\/[a-zA-Z0-9.-]*[a-zA-Z0-9](\\/[^)"]*?)?)\\s+audio:(' + BlergMedia.audioExtensions.join('|') + ')\\)', 'g');
- l = l.replace(re, '$1<a href="$3">$2</a> <a href="$3" onclick="play_audio(); return false"><img src="/images/play.png"></a>');
-
- // Craft a regex that finds URLs that end in the extensions specified by BlergMedia.videoExtensions.
- re = new RegExp('(\\s|^)\\[([^\\]]+)\\]\\((https?:\\/\\/[a-zA-Z0-9.-]*[a-zA-Z0-9]\\/[^)"]*?\\.(' + BlergMedia.videoExtensions.join('|') + '))\\)', 'g');
- l = l.replace(re, '$1<a href="$3">$2</a> <a href="$3" onclick="play_video(); return false"><img src="/images/play.png"></a>');
-
- // Ditto, but use the extended markdown link syntax to specify the format
- re = new RegExp('(\\s|^)\\[([^\\]]+)\\]\\((https?:\\/\\/[a-zA-Z0-9.-]*[a-zA-Z0-9](\\/[^)"]*?)?)\\s+video:(' + BlergMedia.videoExtensions.join('|') + ')\\)', 'g');
- l = l.replace(re, '$1<a href="$3">$2</a> <a href="$3" onclick="play_video(); return false"><img src="/images/play.png"></a>');
-
- // Regular markdown links
- 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');
-
- // 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>');
- l = l.replace(/(\s|^)@([A-Za-z0-9_-]+)(\/\d+)?/g, '$1<a href="#$2$3" class="ref" onclick="return qlink()">@$2</a>');
-
- // Create lists when lines begin with *
- if (l[0] == '*') {
- if (!listMode) {
- var pi = out.lastIndexOf('<p>');
- out[pi] = '<ul>';
- listMode = true;
- }
- l = l.replace(/^\*\s*/, '');
- out.push('<li>');
- endpush = '</li>';
- }
-
- // Create headers when lines begin with = or #
- if (l[0] == '=' || l[0] == '#') {
- var m = l.match(/^([=#]+)/);
- var depth = m[1].length;
- if (depth <= 5) {
- l = l.replace(/^[=#]+\s*/, '').replace(/\s*[=#]+$/, '');
- out.push('<h' + depth + '>');
- endpush = '</h' + depth + '>';
- }
- }
-
- // Remove backslashes from escaped metachars
- l = l.replace(/\\([*\[\]@#])/g, '$1');
-
- out.push(l);
- if (endpush) {
- out.push(endpush);
- endpush = null;
- } else {
- out.push('<br>');
- }
- });
- while (out[out.length - 1] == '<br>' || out[out.length - 1] == '<p>')
- out.pop();
- if (listMode)
- out.push('</ul>');
-
- record.data = out.join('');
- record.date = (new Date(record.timestamp * 1000)).toString();
- record.html = template.evaluate(record);
-}
-
function displayError(msg) {
items.innerText = msg;
}
['hash', /^#\/feed(?:\/p(\d+))?$/, "blerg.Feed"],
['hash', /^#([A-Za-z0-9_-]+)(?:\/(p)?(\d+))?$/, "blerg.User"]
],
- pathHandlers: [ blerg.Welcome ],
+ pathHandlers: [ blerg.User, blerg.Welcome ],
rendered: function() {
this.inherited(arguments);
+enyo.kind({
+ name: "blerg.Pager",
+ kind: "Control",
+ listKind: "Control",
+ lastRecord: null,
+ components: [
+ {name: "records"},
+ {name: "loadMoreButton", kind: "onyx.Button", onclick: "loadMore", content: "Load More"}
+ ],
+ addItems: function(items) {
+ this.$.records.createComponents(items, {kind: this.listKind});
+ for (var i = 0; i < items.length; i++) {
+ var r = parseInt(items[i].record);
+ if (r < this.lastRecord || this.lastRecord == null)
+ this.lastRecord = r;
+ }
+ this.$.records.render();
+ if (this.lastRecord == 0)
+ this.$.loadMoreButton.hide();
+ },
+ loadMore: function() {
+ if (this.lastRecord == 0)
+ return;
+
+ if (this.lastRecord != null) {
+ var to = this.lastRecord - 1;
+ var from = this.lastRecord - 50;
+ if (from < 0)
+ from = 0;
+ this.loadItems(from, to);
+ } else {
+ this.loadItems();
+ }
+ },
+ loadItems: function(from, to) { }
+});
record: null
},
components: [
- {name: "data", noDom: true},
+ {name: "data", noDom: true, allowHtml: true},
{classes: "info", components: [
{noDom: true, content: "Posted "},
{name: "date", noDom: true},
this.updateLinks();
},
dataChanged: function() {
- this.$.data.setContent(postMangle(this.data));
+ this.$.data.setContent(blerg.Util.blergFormat(this.data));
},
timestampChanged: function() {
this.$.date.setContent(new Date(this.timestamp * 1000).toString());
+enyo.kind({
+ name: "blerg.User",
+ kind: "blerg.Pager",
+ listKind: "blerg.Record",
+ published: {
+ username: "",
+ permalink: false,
+ firstRecord: null,
+ },
+ statics: {
+ locationDetect: function(l) {
+ var m = l.hash.match(/^#([A-Za-z0-9_-]+)(?:\/(p)?(\d+))?$/);
+ if (m) {
+ return {
+ kind: "blerg.User",
+ username: m[1],
+ permalink: m[2] != 'p',
+ firstRecord: parseInt(m[3])
+ };
+ }
+ }
+ },
+ create: function() {
+ this.inherited(arguments);
+ this.usernameChanged();
+ },
+ usernameChanged: function() {
+ this.bubble('onSetTitle', {section: '@' + this.username});
+ this.$.records.destroyComponents();
+ this.lastRecord = null;
+ this.loadMore();
+ },
+ loadItems: function(from, to) {
+ this.inherited(arguments);
+
+ var url;
+ if (from != undefined && to != undefined) {
+ url = baseURL + '/get/' + this.username + '/' + from + '-' + to;
+ } else {
+ url = baseURL + '/get/' + this.username;
+ }
+
+ var req = new enyo.Ajax({
+ url: url
+ });
+ req.response(function(inSender, inResponse) {
+ for (var i = 0; i < inResponse.length; i++) {
+ inResponse[i].author = this.username;
+ }
+ this.addItems(inResponse);
+ }.bind(this));
+ req.go();
+ }
+});
+blerg = window.blerg || {};
+
+blerg.Util = {};
+
+blerg.Util.blergFormat = function(text) {
+ var lines = text.split(/\r?\n/);
+ if (lines[lines.length - 1] == '')
+ lines.pop();
+
+ var out = ['<p>'];
+ var endpush = null;
+ var listMode = false;
+ lines.forEach(function(l) {
+ if (l == '') {
+ if (out[out.length - 1] == '<br>') {
+ out[out.length - 1] = '<p>';
+ }
+ if (out[out.length - 1] == '</li>') {
+ out.push('</ul>');
+ out.push('<p>');
+ listMode = false;
+ }
+ return;
+ }
+
+ // Put quoted material into a special paragraph
+ if (l[0] == '>') {
+ var pi = out.lastIndexOf('<p>');
+ if (pi != -1) {
+ out[pi] = '<p class="quote">';
+ l = l.replace(/^>\s*/, '');
+ }
+ }
+
+ // Sanitize HTML input
+ l = l.replace(/&/g, '&').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<a href="$2">$2</a>');
+
+ // Turn markdown links into links
+ var re;
+
+ /*
+ // Craft a regex that finds URLs that end in the extensions specified by BlergMedia.audioExtensions.
+ re = new RegExp('(\\s|^)\\[([^\\]]+)\\]\\((https?:\\/\\/[a-zA-Z0-9.-]*[a-zA-Z0-9]\\/[^)"]*?\\.(' + BlergMedia.audioExtensions.join('|') + '))\\)', 'g');
+ l = l.replace(re, '$1<a href="$3">$2</a> <a href="$3" onclick="play_audio(); return false"><img src="/images/play.png"></a>');
+
+ // Ditto, but use the extended markdown link syntax to specify the format
+ re = new RegExp('(\\s|^)\\[([^\\]]+)\\]\\((https?:\\/\\/[a-zA-Z0-9.-]*[a-zA-Z0-9](\\/[^)"]*?)?)\\s+audio:(' + BlergMedia.audioExtensions.join('|') + ')\\)', 'g');
+ l = l.replace(re, '$1<a href="$3">$2</a> <a href="$3" onclick="play_audio(); return false"><img src="/images/play.png"></a>');
+
+ // Craft a regex that finds URLs that end in the extensions specified by BlergMedia.videoExtensions.
+ re = new RegExp('(\\s|^)\\[([^\\]]+)\\]\\((https?:\\/\\/[a-zA-Z0-9.-]*[a-zA-Z0-9]\\/[^)"]*?\\.(' + BlergMedia.videoExtensions.join('|') + '))\\)', 'g');
+ l = l.replace(re, '$1<a href="$3">$2</a> <a href="$3" onclick="play_video(); return false"><img src="/images/play.png"></a>');
+
+ // Ditto, but use the extended markdown link syntax to specify the format
+ re = new RegExp('(\\s|^)\\[([^\\]]+)\\]\\((https?:\\/\\/[a-zA-Z0-9.-]*[a-zA-Z0-9](\\/[^)"]*?)?)\\s+video:(' + BlergMedia.videoExtensions.join('|') + ')\\)', 'g');
+ l = l.replace(re, '$1<a href="$3">$2</a> <a href="$3" onclick="play_video(); return false"><img src="/images/play.png"></a>');
+ */
+
+ // Regular markdown links
+ 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');
+
+ // 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>');
+ l = l.replace(/(\s|^)@([A-Za-z0-9_-]+)(\/\d+)?/g, '$1<a href="#$2$3" class="ref" onclick="return qlink()">@$2</a>');
+
+ // Create lists when lines begin with *
+ if (l[0] == '*') {
+ if (!listMode) {
+ var pi = out.lastIndexOf('<p>');
+ out[pi] = '<ul>';
+ listMode = true;
+ }
+ l = l.replace(/^\*\s*/, '');
+ out.push('<li>');
+ endpush = '</li>';
+ }
+
+ // Create headers when lines begin with = or #
+ if (l[0] == '=' || l[0] == '#') {
+ var m = l.match(/^([=#]+)/);
+ var depth = m[1].length;
+ if (depth <= 5) {
+ l = l.replace(/^[=#]+\s*/, '').replace(/\s*[=#]+$/, '');
+ out.push('<h' + depth + '>');
+ endpush = '</h' + depth + '>';
+ }
+ }
+
+ // Remove backslashes from escaped metachars
+ l = l.replace(/\\([*\[\]@#])/g, '$1');
+
+ out.push(l);
+ if (endpush) {
+ out.push(endpush);
+ endpush = null;
+ } else {
+ out.push('<br>');
+ }
+ });
+ while (out[out.length - 1] == '<br>' || out[out.length - 1] == '<p>')
+ out.pop();
+ if (listMode)
+ out.push('</ul>');
+
+ return out.join('');
+}
{name: "latestTags", classes: "latest-tags"}
]}
],
- rendered: function() {
+ create: function() {
this.inherited(arguments);
this.bubble("onSetTitle", {section: "Welcome!"});
enyo.depends(
'API.js',
+ 'Util.js',
'Link.js',
'Record.js',
'Title.js',
'SignupDialog.js',
'PasswdDialog.js',
'Welcome.js',
+ 'Pager.js',
+ 'User.js',
'Blerg.js'
);