Tidied Up Url Handling

Navigation/src/StateNavigator.ts

@@ -163,7 +163,7 @@ class StateNavigator {
     }
 
     start(url?: string) {
-        this.navigateLink(url ? url : this.historyManager.getCurrentUrl());
+        this.navigateLink(url != null ? url : this.historyManager.getCurrentUrl());
     };
 }
 export = StateNavigator;

Navigation/src/history/HTML5HistoryManager.ts

@@ -6,7 +6,7 @@ class HTML5HistoryManager implements HistoryManager {
     disabled: boolean = (typeof window === 'undefined') || !(window.history && window.history.pushState);
 
     constructor(applicationPath: string = '') {
-        this.applicationPath = applicationPath;
+        this.applicationPath = HTML5HistoryManager.prependSlash(applicationPath);
     }
 
     init(navigateHistory: () => void) {
@@ -26,22 +26,26 @@ class HTML5HistoryManager implements HistoryManager {
     }
 
     getCurrentUrl(): string {
-        return location.pathname.substring(this.applicationPath.length) + location.search;
+        return this.getUrl(location);
     }
 
     getHref(url: string): string {
         if (url == null)
             throw new Error('The Url is invalid');
-        return this.applicationPath + url;
+        return this.applicationPath + HTML5HistoryManager.prependSlash(url);
     }
 
-    getUrl(anchor: HTMLAnchorElement) {
-        return anchor.pathname.substring(this.applicationPath.length) + anchor.search;
+    getUrl(hrefElement: HTMLAnchorElement | Location) {
+        return hrefElement.pathname.substring(this.applicationPath.length) + hrefElement.search;
     }
 
     stop() {
         if (!this.disabled)
             window.removeEventListener('popstate', this.navigateHistory);
     }
+
+    private static prependSlash(url: string): string {
+        return (url && url.substring(0, 1) !== '/') ? '/' + url : url;
+    }
 }
 export = HTML5HistoryManager;

Navigation/src/history/HashHistoryManager.ts

@@ -30,7 +30,7 @@ class HashHistoryManager implements HistoryManager {
     }
 
     getCurrentUrl(): string {
-        return this.decode(location.hash.substring(1));
+        return this.getUrl(location);
     }
 
     getHref(url: string): string {
@@ -39,8 +39,8 @@ class HashHistoryManager implements HistoryManager {
         return '#' + this.encode(url);
     }
 
-    getUrl(anchor: HTMLAnchorElement) {
-        return this.decode(anchor.hash.substring(1));
+    getUrl(hrefElement: HTMLAnchorElement | Location) {
+        return this.decode(hrefElement.hash.substring(1));
     }
 
     stop() {

Navigation/src/history/HistoryManager.ts

@@ -4,7 +4,7 @@
     addHistory(url: string, replace: boolean): void;
     getCurrentUrl(): string;
     getHref(url: string): string;
-    getUrl(anchor: HTMLAnchorElement): string;
+    getUrl(hrefElement: HTMLAnchorElement | Location): string;
     stop(): void;
 }
 export = HistoryManager;

Navigation/src/navigation.d.ts

@@ -184,9 +184,9 @@ declare namespace Navigation {
          */
         getHref(url: string): string;
         /**
-         * Gets a Url from the anchor 
+         * Gets a Url from the anchor or location
          */
-        getUrl(anchor: HTMLAnchorElement): string;
+        getUrl(hrefElement: HTMLAnchorElement | Location): string;
         /**
          * Removes browser history event listeners
          */
@@ -236,9 +236,9 @@ declare namespace Navigation {
          */
         getHref(url: string): string;
         /**
-         * Gets a Url from the anchor 
+         * Gets a Url from the anchor or location
          */
-        getUrl(anchor: HTMLAnchorElement): string;
+        getUrl(hrefElement: HTMLAnchorElement | Location): string;
         /**
          * Removes a listener for the hashchange event
          */
@@ -287,9 +287,9 @@ declare namespace Navigation {
          */
         getHref(url: string): string;
         /**
-         * Gets a Url from the anchor 
+         * Gets a Url from the anchor or location
          */
-        getUrl(anchor: HTMLAnchorElement): string;
+        getUrl(hrefElement: HTMLAnchorElement | Location): string;
         /**
          * Removes a listener for the popstate event
          */

Navigation/test/NavigationTest.ts

@@ -4933,4 +4933,40 @@ describe('Navigation', function () {
             });
         }
     });
+
+    describe('Start Route', function () {
+        it('should navigate', function() {
+            var stateNavigator = new Navigation.StateNavigator([
+                { key: 's0', route: '' },
+                { key: 's1', route: 'ab' }
+            ]);
+            stateNavigator.start('/ab');
+            assert.strictEqual(stateNavigator.stateContext.state, stateNavigator.states['s1']);
+        });
+    });
+
+    describe('Start Empty Route', function () {
+        it('should navigate', function() {
+            var stateNavigator = new Navigation.StateNavigator([
+                { key: 's0', route: '' },
+                { key: 's1', route: 'ab' }
+            ]);
+            stateNavigator.start('');
+            assert.strictEqual(stateNavigator.stateContext.state, stateNavigator.states['s0']);
+        });
+    });
+
+    describe('HTML5 History', function () {
+        it('should prepend slash', function() {
+            var history = new Navigation.HTML5HistoryManager();
+            assert.strictEqual(history.getHref('a'), '/a');
+            assert.strictEqual(history.getHref('/a'), '/a');
+            history = new Navigation.HTML5HistoryManager('a');
+            assert.strictEqual(history.getHref('b'), '/a/b');
+            assert.strictEqual(history.getHref('/b'), '/a/b');
+            history = new Navigation.HTML5HistoryManager('/a');
+            assert.strictEqual(history.getHref('b'), '/a/b');
+            assert.strictEqual(history.getHref('/b'), '/a/b');
+        });
+    });
 });