Cleaning router core

neetjn · Sep 2, 2019 · ac8a1d2 · ac8a1d2
1 parent 6091a75
commit ac8a1d2
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 11 deletions.
diff --git a/dist/router.js.map b/dist/router.js.map
diff --git a/src/interfaces/router.d.ts b/src/interfaces/router.d.ts
@@ -18,10 +18,10 @@ export interface IRouterArgs {
 }
 
 export interface IRouter {
+  $location: IRouterLocation;
+  $previous: IRouterLocation,
+  $tools: IRouterTools;
   config: IConfig;
-  location: IRouterLocation;
-  previous: IRouterLocation,
-  tools: IRouterTools;
   running: boolean;
   legacySupport: boolean;
   listenerKey?: number;

diff --git a/src/router.ts b/src/router.ts
@@ -19,10 +19,10 @@ class RouterTools implements IRouterTools {
 }
 
 class Router implements IRouter {
+  public $location: IRouterLocation;
+  public $previous: IRouterLocation;
+  public $tools: IRouterTools;
   public config: IConfig;
-  public location: IRouterLocation;
-  public previous: IRouterLocation;
-  public tools: IRouterTools;
   public running: boolean;
   public legacySupport: boolean;
   public listenerKey?: number;
@@ -33,7 +33,7 @@ class Router implements IRouter {
     this.client = args.client;
     this.running = false;
 
-    Object.defineProperty(this, 'location', {
+    Object.defineProperty(this, '$location', {
       get: () => {
         return {
           hash: window.location.hash,
@@ -49,15 +49,18 @@ class Router implements IRouter {
   }
 
   watch () {
+    // TODO: make ambiguous, must be able to run only on route change w/ interval
+
     if (this.running) {
+      // let navigated =
       if (this.client && this.client.onNavigate) {
         this.client.onNavigate({
           router: this,
-          location: this.location,
-          previous: this.previous,
+          location: this.$location,
+          previous: this.$previous,
         });
 
-        this.previous = this.location;
+        this.$previous = this.$location;
       }
     }
   }