From 3df2f3df34559e25fb5dad22ff607e0263328909 Mon Sep 17 00:00:00 2001
From: "Collin J. Doering" <collin.doering@rekahsoft.ca>
Date: Thu, 22 Jan 2015 13:35:58 -0500
Subject: [PATCH] Cleaned up client side URL rewriting

When a page listed in the navigation was opened in a new page/tab, the
url used to be the whole path (/#/pages/pagename.html). This commit
enables rewriting of the urls (using jquery address) so that the client
always sees a pretty url (eg /#/blog.html instead of
/#/pages/blog.html).

Also fixed issue introduced last commit (b6d6830) where when clicking on
post or tag links failed to activate the blog menuitem.

Signed-off-by: Collin J. Doering <collin.doering@rekahsoft.ca>
---
 js/default.js | 22 +++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/js/default.js b/js/default.js
index 778f8cc..ca5ead7 100644
--- a/js/default.js
+++ b/js/default.js
@@ -49,19 +49,20 @@
 
         function loadPageContent(page_href) {
             var post_regexp = /posts\/.*\.html/,
+                page_regexp = /pages\/(.*\.html)/,
                 tag_regexp = /tags\/.*(\d*)\.html/,
-                blog_page_regexp = /blog\d*\.html/,
-                tag_not_regexp = /(tags\/.*[^\d]+)(\.html)/;
+                tag_not_regexp = /(tags\/.*[^\d]+)(\.html)/,
+                blog_page_regexp = /(pages\/)?(blog\d*\.html)/;
 
             // Check whether the requested url is a post
             if (post_regexp.test(page_href)) {
                 // Handle post urls (no change required to page_href)
                 $('#nav-menu li.active').removeClass('active');
-                $('#nav-menu li a[href="./pages/blog.html"]').parent('li').addClass('active');
+                $('#nav-menu li a[href="/#/pages/blog.html"]').parent('li').addClass('active');
             } else if (tag_regexp.test(page_href)) {
                 // Handle tag pages
                 $('#nav-menu li.active').removeClass('active');
-                $('#nav-menu li a[href="./pages/blog.html"]').parent('li').addClass('active');
+                $('#nav-menu li a[href="/#/pages/blog.html"]').parent('li').addClass('active');
 
                 if (tag_not_regexp.test(page_href)) {
                     page_href = page_href.replace(tag_not_regexp, "$11$2");
@@ -71,8 +72,11 @@
                 if (page_href === '/') {
                     page_href = '/home.html';
                 } else if (blog_page_regexp.test(page_href)) {
-                    if (page_href === "/blog.html" || page_href === "/pages/blog.html") {
+                    if (page_href === "/blog.html") {
                         page_href = "/blog1.html";
+                    } else if (/pages\/.*/.test(page_href)) {
+                        $.address.value(page_href.replace(blog_page_regexp, "$2"));
+                        return;
                     }
 
                     // If page_href refers to a blog page set Blog to be the active menu item
@@ -84,8 +88,12 @@
                 $('a.menuitem[rel="address:' + page_href + '"]').closest('ul').find('li.active').removeClass('active');
                 $('a.menuitem[rel="address:' + page_href + '"]').closest('li').addClass('active');
 
-                // set page_href of full url for ajax call when pages/ isn't specified
-                if (! /\/?pages\/.*/.test(page_href)) {
+                // Rewrite page url if it specifies pages/ prefix; otherwise set page_href to
+                // full url (including pages/ prefix) for ajax call
+                if (page_regexp.test(page_href)) {
+                    $.address.value(page_href.replace(page_regexp, "$1"));
+                    return;
+                } else {
                     page_href = "pages" + page_href;
                 }
             }