X-Git-Url: http://git.bytex64.net/?a=blobdiff_plain;ds=inline;f=www%2Fjs%2Fblerg.js;h=6d555b8868058767eaa942c5af84b623a825c443;hb=21db04ef3e4f66d7b5c4c9be2be36703b18cbcaa;hp=83a8a88683f523c3554b05f72e5a49a8fab816af;hpb=756f2f096cf6a6f7126e053846c1b87b089e30ce;p=blerg.git
diff --git a/www/js/blerg.js b/www/js/blerg.js
index 83a8a88..6d555b8 100644
--- a/www/js/blerg.js
+++ b/www/js/blerg.js
@@ -404,6 +404,25 @@ function mangleRecord(record, template) {
l = l.replace(/(\s|^)(https?:\/\/[a-zA-Z0-9.-]*[a-zA-Z0-9](\/([^\s"]*[^.!,;?()\s])?)?)/g, '$1$2');
// 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$2 ');
+
+ // 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$2 ');
+
+ // 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$2 ');
+
+ // 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$2 ');
+
+ // Regular markdown 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
@@ -628,6 +647,36 @@ function signup_cancel() {
urlSwitch();
}
+function passwd() {
+ var old_password = $('passwd.old_password').value;
+ var new_password = $('passwd.new_password').value;
+
+ new Ajax.Request(baseURL + '/passwd', {
+ parameters: {
+ username: loginStatus.username,
+ password: old_password,
+ new_password: new_password
+ },
+ onSuccess: function(r) {
+ if (r.responseJSON.status == 'success') {
+ alert('Password changed');
+ passwd_cancel();
+ } else {
+ alert('Password change failed. Your password has NOT been changed.');
+ }
+ },
+ onFailure: function(r) {
+ alert('Password change error');
+ }
+ });
+}
+
+function passwd_cancel() {
+ $('passwd').hide();
+ $('navigation').show();
+ urlSwitch();
+}
+
function subscribe() {
new Ajax.Request(baseURL + '/subscribe/' + currentPager.username, {
method: 'post',
@@ -781,20 +830,6 @@ function qlink(loc) {
return false;
}
-function Welcome() {
- loadLatest();
-}
-
-Welcome.prototype.show = function() {
- $$('[name=section]').each(function(v) { v.update('Welcome') });
- $('welcome').show();
-}
-
-Welcome.prototype.hide = function() {
- stopTicker();
- $('welcome').hide();
-}
-
function ExternalURLPost(m) {
this.title = decodeURIComponent(m[1]).replace(']','').replace('[','');
this.url = decodeURIComponent(m[2]);
@@ -804,66 +839,3 @@ ExternalURLPost.prototype.show = function() {
$('post.content').value = '[' + this.title + '](' + this.url + ')';
$('post').show();
}
-
-var urlmap = [
- ['search', /^\?post\/([^/]+)\/(.+)/, ExternalURLPost],
- ['hash', /^#\/(ref|tag)\/([A-Za-z0-9_-]+)(?:\/p(\d+))?$/, Tag],
- ['hash', /^#\/feed(?:\/p(\d+))?$/, Feed],
- ['hash', /^#([A-Za-z0-9_-]+)(?:\/(p)?(\d+))?$/, User]
-];
-
-function urlSwitch() {
- var m;
- var pageconstructor;
-
- for (var i = 0; i < urlmap.length; i++) {
- if (m = location[urlmap[i][0]].match(urlmap[i][1])) {
- pageconstructor = urlmap[i][2];
- break;
- }
- }
- if (i == urlmap.length)
- pageconstructor = Welcome;
-
- if (currentPager && currentPager instanceof pageconstructor) {
- // updateState returns true if the state has been successfully updated.
- // Otherwise, we continue and create a new instance.
- if (currentPager.updateState(m))
- return;
- }
-
- if (currentPager && currentPager.hide)
- currentPager.hide();
-
- currentPager = new pageconstructor(m);
- if (currentPager.show)
- currentPager.show();
-}
-
-var lastHash;
-function hashCheck() {
- if (location.hash != lastHash) {
- lastHash = location.hash;
- urlSwitch();
- }
-}
-
-function init() {
- items = $('items');
- loginStatus = new LoginStatus();
-
- lastHash = location.hash;
- urlSwitch();
-
- setInterval(hashCheck, 250);
-
- document.body.observe('keyup', function(event) {
- if (event.shiftKey && event.keyCode == 32) {
- postPopup();
- event.stop();
- }
- });
- $('post.content').addEventListener('keyup', function(event) {
- event.stopPropagation();
- }, true);
-}