more updates

Author: quantuminformation

demo/typescriptImport/index.ts

@@ -3,17 +3,19 @@ import {Configuration} from "../../src/Configuration";
 import {Route} from "../../src/Route";
 
 function createDemo() {
+  const configuration = new Configuration()
+  configuration.defaultRoute = ""
+  const router = new WarpRouter('.container', configuration)
   let routes: Map<string,Route> = new Map()
   routes.set("", new Route(function () {
     return "This is the home page"
   }))
-  routes.set("#page1", new Route(function () {
-    return "This uses a custom context"
-  }))
+  routes.set("#page1", new Route(() => {
+    router.hostElement.innerHTML = `<p>This content was generated by a routing function</p>`
+    }
+  ))
 
-  const configuration = new Configuration()
-  configuration.defaultRoute = ""
-  const component = new WarpRouter('.container', routes, configuration)
+  router.setRoutes(routes)
 }
 
 createDemo()

package.json

@@ -1,6 +1,6 @@
 {
   "name": "warp-router",
-  "version": "0.1.1",
+  "version": "0.1.3",
   "description": "",
   "main": "build/warp-router.js",
   "types": "build/src/WarpRouter.d.ts",
@@ -31,7 +31,7 @@
     "html-webpack-plugin": "^2.24.1",
     "ts-loader": "^1.0.0",
     "typescript": "^2.1.5",
-    "webpack": "2.2.0-rc.7",
+    "webpack": "^2.2.0",
     "webpack-build-notifier": "^0.1.13"
   }
 }

src/WarpRouter.ts

@@ -2,25 +2,27 @@ import {Configuration} from "./Configuration";
 import {Route} from "./Route";
 export default class WarpRouter {
 
-  private hostElement: HTMLElement
+  public hostElement: HTMLElement
+  public routes: Map<string, Route>
+
 
   /**
    *
    * @param selector where the router will be embedded
    * @param routes can take a function that will generate a string
    */
   constructor(public selector: string,
-              public routes: Map<string, Route>,
               public configuration: Configuration = new Configuration()) {
-
     this.hostElement = <HTMLElement> document.querySelector(selector)
+
     if (!window.location.hash && configuration.defaultRoute !== null) {
       window.location.hash = configuration.defaultRoute
     }
-    this.applyRouteContentFunction(window.location.hash)
-    this.addListeners()
   }
 
+  setRoutes(routes: Map<string, Route>) {
+    this.routes = routes
+  }
 
   applyRouteContentFunction(routeString: string) {
     try {
@@ -40,5 +42,9 @@ export default class WarpRouter {
       this.applyRouteContentFunction(window.location.hash)
     });
   }
+
+  attach() {
+    this.addListeners()
+  }
 }