MontoyaTech/ignite-html-router
MontoyaTech/ignite-html-router
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Cleaned up code and fixed a bug where parameters were not taking into consideration with routes that are not root based.

Browse Source
This commit is contained in:
MattMo 2023-07-09 22:24:33 -07:00
parent 8560e24761
commit 0ebd6d1ab4
1 changed files with 22 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
ignite-html-router.js
View File

@ -371,7 +371,7 @@ class Router {
//If hash mode is set and we have a hash location, get it and split it.
if (Router.hashMode && window.location.hash && window.location.hash.length > 0) {
var path = window.location.hash.substr(1);
var path = window.location.hash.substring(1);
//If the path contains ? then remove the query.
if (path.includes("?")) {
@ -392,11 +392,12 @@ class Router {
var fromRoot = (route.trim().startsWith("/"));
var routeParts = (fromRoot ? route.trim().split("/").splice(1) : route.trim().split("/"));
//Check to see if we have a trailing route part, if so, remove it.
//Remove trailing parts
if (pathParts.length > 0 && pathParts[pathParts.length - 1] == "") {
pathParts.pop();
}
//Remove trailing parts
if (routeParts.length > 0 && routeParts[routeParts.length - 1] == "") {
routeParts.pop();
}
@ -405,7 +406,7 @@ class Router {
if (pathParts.length == 0 && routeParts.length == 0) {
return true;
}
//If path parts is 0, and the route part is ** then this is a match.
//If path parts is 0, and the route part is a wildcard then this is a match.
else if (pathParts.length == 0 && routeParts.length == 1 && (routeParts[0] == "**" || routeParts[0] == "*")) {
return true;
}
@ -413,7 +414,7 @@ class Router {
else if (pathParts.length == 0 && routeParts.length == 1 && routeParts[0].startsWith("!")) {
return true;
}
//If the path parts is 0 and the route is !*/** then this is a match
//If the path parts is 0 and the route is an exclude wildcard then this is a match
else if (pathParts.length == 0 && routeParts.length == 2 && routeParts[0].startsWith("!") && routeParts[1] == "**") {
return true;
}
@ -446,16 +447,20 @@ class Router {
}
} else {
for (var offset = 0; offset < pathParts.length; offset++) {
for (var i = 0; i < max; i++) {
if (i + offset >= pathParts.length) {
for (var i = 0; i <= max; i++) {
if (i == max) {
return true;
} else if (i + offset >= pathParts.length) {
return false;
} else if (routeParts[i].startsWith("{") && routeParts[i].endsWith("}")) {
if (data) {
data[routeParts[i].substring(1, routeParts[i].length - 1)] = pathParts[i + offset];
}
else if (routeParts[i].startsWith("!") && pathParts[i + offset] == routeParts[i].substring(1)) {
} else if (routeParts[i].startsWith("!") && pathParts[i + offset] == routeParts[i].substring(1)) {
break;
} else if (routeParts[i] == "**") {
return true;
}
else if (routeParts[i] != pathParts[i + offset] && routeParts[i] != "*" && !routeParts[i].startsWith("!")) {
} else if (routeParts[i] != pathParts[i + offset] && routeParts[i] != "*" && !routeParts[i].startsWith("!")) {
break;
} else if (i + 1 == routeParts.length && offset + routeParts.length == pathParts.length) {
return true;