vaderjs 1.0.8 → 1.0.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vaderjs",
-  "version": "1.0.8",
+  "version": "1.0.9",
   "description": "A Reactive Framework for Single-Page Applications (SPA)",
   "main": "vader.js",
   "scripts": {

package/vaderRouter.js

@@ -63,6 +63,7 @@ class VaderRouter {
    * Starts the router.
    */
   start() {
+    
     if (!this.routes[window.location.hash.substring(1)]) {
       window.location.hash = this.starturl;
     }
@@ -72,7 +73,12 @@ class VaderRouter {
         : window.location.hash.substring(1);
       // remove '' from array
       hash = hash.filter((item) => item !== "");
-      const basePath = "/" + hash[0];
+      let basePath = "";
+      if (hash.length > 1) {
+          basePath = hash[0] + "/" + hash[1];
+      } else {
+          basePath = hash[0];
+      }
 
       if (!this.routes[basePath] && !this.customerror) {
         window.location.hash = this.starturl;
@@ -313,19 +319,22 @@ class VaderRouter {
         .join("/");
       const regex = new RegExp("^" + parsedPath + "(\\?(.*))?$");
 
-      this.currentUrl = path;
-      // replace params if preset
-      let route = "";
-      if (path.includes(":")) {
-        route = path.split(":")[0].replace(/\/$/, "");
+      let hash = window.location.hash.split("#")[1]
+          ? window.location.hash.split("#")[1]
+          : window.location.hash;
+    
+      let basePath = "";
+      if (hash.length > 1) {
+          basePath =  hash.split("/")[0] + "/" + hash.split("/")[1];
       } else {
-        route = path.replace(/\/$/, "");
+          basePath = hash[0];
       }
+      const route = basePath;
 
       window.$CURRENT_URL = route;
       window.$URL_PARAMS = {};
       if (
-        window.location.hash.substring(1).match(regex) &&
+          window.location.hash.substring(1).match(regex) &&
         this.routes[$CURRENT_URL]
       ) {
         this.storedroutes.push(window.location.hash.substring(1));