X-Git-Url: http://git.bytex64.net/?a=blobdiff_plain;f=www%2Fjs%2Fblerg.js;h=8da387280e2ed77954dc23d23cad2331b9a46ba4;hb=9818631aecddd827374a0c01b3ec287e7b018bb1;hp=83483fa4b0e4ec671fa2ea6afb5030642cfe3a49;hpb=481423bac9915a431020b5e5e7672300d4adb3b0;p=blerg.git

diff --git a/www/js/blerg.js b/www/js/blerg.js
index 83483fa..8da3872 100644
--- a/www/js/blerg.js
+++ b/www/js/blerg.js
@@ -365,118 +365,6 @@ User.prototype.loadItems = function(from, to, continuation) {
     });
 }
 
-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, '&amp;').replace(/</g, '&lt;').replace(/>/g, '&gt;');
-
-        // 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;
 }
@@ -647,6 +535,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',
@@ -691,25 +609,6 @@ function unsubscribe() {
     });
 }
 
-var resizePostContentTimeout = null;
-function resizePostContent() {
-    if (resizePostContentTimeout)
-        clearTimeout(resizePostContentTimeout);
-    resizePostContentTimeout = setTimeout(function() {
-        var c = $('post.content');
-        var lines = Math.floor(c.value.length / (100 * (c.clientWidth / 1000))) + 1;
-        var m = c.value.match(/\r?\n/g);
-        if (m)
-            lines += m.length;
-        if (lines <= 3) {
-            c.style.height = "";
-        } else {
-            c.style.height = (lines * 17) + "pt";
-        }
-        resizePostContentTimeout = null;
-    }, 150);
-}
-
 var tickerTimer = null;
 var tickerHead, tickerTail;
 
@@ -786,34 +685,6 @@ function loadLatest() {
     });
 }
 
-function qlink(loc) {
-    if (loc) {
-        location.hash = loc;
-    } else if (event && event.target) {
-        location.href = event.target.href;
-    } else {
-        // Bogus qlink
-        return;
-    }
-    lastHash = location.hash;
-    urlSwitch();
-    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]);
@@ -823,66 +694,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);
-}