X-Git-Url: http://git.bytex64.net/?a=blobdiff_plain;ds=sidebyside;f=www%2Fjs%2Fblerg.js;h=2125c5bef86f5faace6e856f7249cf3f2d4bd543;hb=4c3823106abb40d31797b51eeb047018698afc12;hp=9b1db74f346ba316edc5eb3a0d2bb8a03dcce7a1;hpb=a2ca84770dd9230c1c6d4e2f08b0d3638604d99a;p=blerg.git

diff --git a/www/js/blerg.js b/www/js/blerg.js
index 9b1db74..2125c5b 100644
--- a/www/js/blerg.js
+++ b/www/js/blerg.js
@@ -5,93 +5,15 @@
 // 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="' + baseURL + '/\##{author}/#{record}" onclick="return qlink()">[permalink]</a> <a href="#" onclick="postPopup(\'@#{author}/#{record}: \'); return false">[reply]</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>'
+    '<div class="record">#{data}<div class="info">Posted by <a class="author ref" href="/\##{author}" onclick="return qlink()">@#{author}</a> on #{date}. <a href="' + baseURL + '/\##{author}/#{record}" onclick="return qlink()">[permalink]</a> <a href="#" onclick="postPopup(\'@#{author}/#{record}: \'); return false">[reply]</a></div></div>'
 );
 var latestRecordsTemplate = new Template(
-    '<div class="record"><a class="author ref" href="/\##{author}" onclick="return qlink()">@#{author}</a> #{data}</div>'
+    '<div class="record"><a class="author ref" href="' + baseURL + '/\##{author}" onclick="return qlink()">@#{author}</a> #{data}</div>'
 );
 
-// Page elements
-var items;
-
-// Other globals
-var currentPager;
-var loginStatus;
-
-// Object to keep track of login status
-function LoginStatus() {
-    var cookies = {};
-    document.cookie.split(/;\s+/).each(function(v) {
-        kv = v.split('=');
-        cookies[kv[0]] = kv[1];
-    });
-    if (cookies.auth && cookies.username) {
-        this.loggedIn = true;
-        this.username = cookies.username;
-    } else {
-        this.loggedIn = false;
-        this.username = null;
-    }
-    this.update();
-}
-
-LoginStatus.prototype.login = function(username, password) {
-    new Ajax.Request(baseURL + '/login', {
-        parameters: {
-            username: username,
-            password: password
-        },
-        onSuccess: function(r) {
-            var j = r.responseText.evalJSON();
-            if (j && j.status == 'success') {
-                this.loggedIn = true;
-                this.username = username;
-                document.cookie = "username=" + username;
-                $('login.password').value = '';
-                this.update();
-            } else {
-                alert("Could not log in");
-                $('login.username').focus();
-            }
-        }.bind(this),
-        onFailure: function(r) {
-            alert("Could not log in");
-            $('login.username').focus();
-        }
-    });
-}
-
-LoginStatus.prototype.logout = function() {
-    new Ajax.Request(baseURL + '/logout', {
-        parameters: {
-            username: this.username
-        },
-        onSuccess: function(r) {
-            this.loggedIn = false;
-            document.cookie = "auth=; expires=1-Jan-1970 00:00:00 GMT";
-            this.update();
-        }.bind(this)
-    });
-    document.cookie = "username=; expires=1-Jan-1970 00:00:00 GMT";
-}
-
-LoginStatus.prototype.update = function() {
-    if (this.loggedIn) {
-        $('userlink').href = '/#' + this.username;
-        $('userlink').update('@' + this.username);
-        $('reflink').href = '/#/ref/' + this.username;
-        $('login').hide();
-        $('logout').show();
-    } else {
-        $('post').hide();
-        $('login').show();
-        $('logout').hide();
-    }
-}
-
 LoginStatus.prototype.post = function(msg) {
     if (!this.loggedIn) {
         alert("You are not logged in!");
@@ -111,8 +33,7 @@ LoginStatus.prototype.post = function(msg) {
                     qlink(this.username);
                 } else {
                     currentPager.itemCount++;
-                    currentPager.pageStart = null;
-                    currentPager.loadItems();
+                    currentPager.reload();
                 }
             } else {
                 alert('Post failed!');
@@ -124,17 +45,28 @@ LoginStatus.prototype.post = function(msg) {
     });
 }
 
-
 // Base object for paged data
 function Pager() {
     this.itemsPerPage = 10;
-}
-
-Pager.prototype.initPager = function() {
     this.itemCache = new Hash();
     this.pageStart = null;
 }
 
+Pager.prototype.updateState = function(m) {
+    return false;
+}
+
+Pager.prototype.show = function() {
+    items.show();
+}
+
+Pager.prototype.hide = function() {
+    items.hide();
+    items.update();
+    $('newer_link').hide();
+    $('older_link').hide();
+}
+
 Pager.prototype.olderPage = function() {
     if (this.pageStart >= this.itemsPerPage) {
         qlink(this.baseFrag + '/p' + (this.pageStart - this.itemsPerPage));
@@ -169,276 +101,59 @@ Pager.prototype.displayItems = function() {
     }
 
     if (this.pageStart < this.itemCount - 1) {
-        $('newer_link').href = '/#' + this.baseFrag + '/p' + (this.pageStart + this.itemsPerPage);
+        $('newer_link').href = baseURL + '/#' + this.baseFrag + '/p' + (this.pageStart + this.itemsPerPage);
         $('newer_link').show();
     } else {
         $('newer_link').hide();
     }
 
     if (this.pageStart >= 10) {
-        $('older_link').href = '/#' + this.baseFrag + '/p' + (this.pageStart - this.itemsPerPage);
+        $('older_link').href = baseURL + '/#' + this.baseFrag + '/p' + (this.pageStart - this.itemsPerPage);
         $('older_link').show();
     } 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) {
-    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.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) {
-    this.showPageAt(r);
-}
-
-
-// Object to render user pages
-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',
-        onSuccess: function(r) {
-            var j = r.responseText.evalJSON();
-            if (j) {
-                this.itemCount = parseInt(j.record_count);
-                this.displayItems();
-            }
-        }.bind(this)
-    });
-}
-User.prototype = new Pager();
-User.prototype.constructor = User;
-
-User.prototype.show = function() {
-    $$('[name=section]').each(function(v) { v.update(' @' + this.username) }.bind(this));
-    $('welcome').hide();
-    items.show();
-    $('rss').show();
-    $('rsslink').href = '/rss/' + this.username;
-    $$('[name=user.reflink]').each(function(e) {
-        e.href = '/#/ref/' + this.username;
-    }.bind(this));
-    $('usercontrols').show();
-}
-
-User.prototype.loadItems = function(from, to) {
-    var url;
-    if (from != undefined && to != undefined) {
-        url = baseURL + '/get/' + this.username + '/' + from + '-' + to;
-        this.pageStart = to;
+    if (this.itemCache[r]) {
+        $('older_link').hide();
+        $('newer_link').hide();
+        items.update(this.itemCache[r].html);
     } else {
-        url = baseURL + '/get/' + this.username;
+        this.loadItems(r, r, Pager.prototype.showRecord.bind(this, r));
     }
-
-    new Ajax.Request(url, {
-        method: 'get',
-        onSuccess: function(r) {
-            var records = r.responseText.evalJSON();
-            if (records && records.length > 0) {
-                records.each(function(v) {
-                    v.id = v.record;
-                    mangleRecord(v, recordTemplate);
-                });
-                this.addItems(records);
-                if (!this.pageStart)
-                    this.pageStart = records[0].recInt;
-            }
-            this.displayItems();
-        }.bind(this),
-        onFailure: function(r) {
-            this.displayItems();
-        }.bind(this),
-        on404: function(r) {
-            displayError('User not found');
-        }
-    });
 }
 
-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;
-        }
-
-        if (l[0] == '>') {
-            var pi = out.lastIndexOf('<p>');
-            if (pi != -1) {
-                out[pi] = '<p class="quote">';
-                l = l.replace(/^>\s*/, '');
-            }
-        }
-        if (l[0] == '*') {
-            if (!listMode) {
-                var pi = out.lastIndexOf('<p>');
-                out[pi] = '<ul>';
-                listMode = true;
-            }
-            l = l.replace(/^\*\s*/, '');
-            out.push('<li>');
-            endpush = '</li>';
-        }
-        if (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 + '>';
-            }
-        }
-
-        // 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
-        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)\*\*([^*]+)\*\*(\s)/g, '$1<b>$2</b>$3');
-        l = l.replace(/(\s)\*([^*]+)\*(\s)/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_-]+)/g, '$1<a href="#$2" class="ref" onclick="return qlink()">@$2</a>');
-
-        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();
-
-    record.data = out.join('');
-    record.date = (new Date(record.timestamp * 1000)).toString();
-    record.html = template.evaluate(record);
-}
+Pager.prototype.loadItems = function(from, to, continuation) { }
 
 function displayError(msg) {
     items.innerText = msg;
 }
 
-
-// Object for browsing tags
-function Tag(type, tag) {
-    this.initPager();
-    this.type = type;
-    this.tag = tag;
-
-    var url = baseURL + "/tag/";
-    switch(type) {
-    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);
-        return;
-    }
-    url += tag;
-
-    new Ajax.Request(url, {
-        method: 'get',
-        onSuccess: function(r) {
-            var j = r.responseText.evalJSON();
-            if (j) {
-                var maxid = j.length - 1;
-                j.each(function(v, i) {
-                    v.id = maxid - i;
-                    mangleRecord(v, tagRecordTemplate)
-                });
-                this.addItems(j);
-                this.pageStart = j.length - 1;
-            }
-            this.displayItems();
-        }.bind(this),
-        onFailure: function(r) {
-            this.displayItems();
-        }.bind(this)
-    });
-
-}
-Tag.prototype = new Pager();
-Tag.prototype.constructor = Tag;
-
-Tag.prototype.show = function() {
-    var ctype = {ref: '@', tag: '#'}[this.type];
-
-    $$('[name=section]').each(function(v) {
-        v.update(' about ' + ctype + this.tag);
-    }.bind(this));
-    $('welcome').hide();
-    $('post').hide();
-    $('older_link').hide();
-    $('newer_link').hide();
-    $('rss').hide();
-    items.show();
-    $('usercontrols').hide();
-}
-
-
 // Pager for browsing subscription feeds
-function Feed() {
-    this.initPager();
+function Feed(m) {
+    Pager.call(this);
+    this.username = loginStatus.username;
     this.baseFrag = '/feed';
+    this.pageStart = parseInt(m[1]);
 
     new Ajax.Request(baseURL + '/feed', {
         method: 'post',
@@ -454,7 +169,10 @@ function Feed() {
                     mangleRecord(v, tagRecordTemplate)
                 });
                 this.addItems(response);
-                this.pageStart = response.length - 1;
+                if (!this.pageStart)
+                    this.pageStart = response.length - 1;
+                this.itemCount = response.length;
+                loginStatus.requestFeedStatus();
             }
             this.displayItems();
         }.bind(this),
@@ -466,28 +184,31 @@ function Feed() {
 Feed.prototype = new Pager();
 Feed.prototype.constructor = Feed;
 
+Feed.prototype.updateState = function(m) {
+    this.pageStart = parseInt(m[1]) || this.itemCount - 1;
+    this.displayItems();
+
+    return true;
+}
+
 Feed.prototype.show = function() {
+    Pager.prototype.show.call(this);
     $$('[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) {
+function postPopup(initial) {
+    if (loginStatus.loggedIn || initial) {
         var post = $('post');
         if (post.visible()) {
             post.hide();
         } else {
             post.show();
-            if (currentPager.username && currentPager.username != loginStatus.username && !$('post.content').value) {
+            if (initial) {
+                $('post.content').value = initial;
+            } else if (!$('post.content').value && currentPager.username && currentPager.username != loginStatus.username) {
                 $('post.content').value = '@' + currentPager.username + ': ';
             }
             $('post.content').focus();
@@ -518,7 +239,37 @@ function signup() {
 
 function signup_cancel() {
     $('signup').hide();
-    hashSwitch();
+    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() {
@@ -565,25 +316,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;
 
@@ -634,14 +366,15 @@ function stopTicker() {
 
 function loadLatest() {
     new Ajax.Request(baseURL + '/latest.json', {
+        method: 'GET',
         onSuccess: function(r) {
             var j = r.responseText.evalJSON();
 
             $('latest-tags').update();
             j.tags.each(function(v) {
-                var a = new Element('a', {href: '/#/tag/' + v});
+                var a = new Element('a', {href: baseURL + '/#/tag/' + v});
                 a.insert('#' + v);
-                a.onclick = qlink;
+                a.onclick = "return qlink()";
                 a.className = 'ref';
                 $('latest-tags').insert(a);
                 $('latest-tags').appendChild(document.createTextNode(' '));
@@ -659,90 +392,12 @@ function loadLatest() {
     });
 }
 
-function qlink(loc) {
-    if (loc) {
-        location.hash = loc;
-    } else if (this.href) {
-        location.hash = this.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_-]+)$/)) {
-        currentPager = new Tag(m[1], m[2]);
-        currentPager.show();
-    } 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();
-        loginStatus.update();
-
-        if (m[3]) {
-            var r = parseInt(m[3]);
-            if (m[2] == 'p') {
-                currentPager.showPageAt(r);
-            } else {
-                currentPager.showRecord(r);
-            }
-        } else {
-            currentPager.pageStart = currentPager.itemCount - 1;
-            currentPager.loadItems();
-        }
-    } else {
-        $$('[name=section]').each(function(v) { v.update('Welcome') });
-        $('signup').hide();
-        items.update();
-        items.hide();
-        $('newer_link').hide();
-        $('older_link').hide();
-        $('welcome').show();
-        $('rss').hide();
-        $('usercontrols').hide();
-        loadLatest();
-    }
-}
-
-var lastHash;
-function hashCheck() {
-    if (location.hash != lastHash) {
-        lastHash = location.hash;
-        hashSwitch();
-    }
+function ExternalURLPost(m) {
+    this.title = decodeURIComponent(m[1]).replace(']','').replace('[','');
+    this.url = decodeURIComponent(m[2]);
 }
 
-function init() {
-    items = $('items');
-    loginStatus = new LoginStatus();
-
-    lastHash = location.hash;
-    hashSwitch();
-
-    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);
+ExternalURLPost.prototype.show = function() {
+    $('post.content').value = '[' + this.title + '](' + this.url + ')';
+    $('post').show();
 }