Skip to content

Commit 6d03e20

Browse files
committed
working on openscriptjs
1 parent b4e01f3 commit 6d03e20

2 files changed

Lines changed: 19 additions & 3 deletions

File tree

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "modular-openscriptjs",
3-
"version": "1.0.30",
3+
"version": "1.0.31",
44
"description": "OpenScriptJs Framework - A lightweight, reactive JavaScript framework for building modern web applications",
55
"type": "module",
66
"main": "./dist/modular-openscriptjs.umd.js",

src/router/Router.js

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -475,11 +475,27 @@ export default class Router {
475475
* @returns
476476
*/
477477
is(nameOrRoute) {
478-
if (nameOrRoute == this.__resolved) return true;
478+
//if the nameOrRoute is a route, remove the trailing slash
479+
if (nameOrRoute.endsWith("/")) {
480+
nameOrRoute = nameOrRoute.slice(0, -1);
481+
}
482+
483+
let resolved = this.__resolved;
484+
485+
if (resolved.endsWith("/")) {
486+
resolved = resolved.slice(0, -1);
487+
}
488+
489+
if (nameOrRoute == resolved) return true;
479490

480491
for (let [n, r] of this.nameMap) {
481492
if (n == nameOrRoute) {
482-
return r == this.__resolved;
493+
494+
if (r.endsWith("/")) {
495+
r = r.slice(0, -1);
496+
}
497+
498+
return r == resolved;
483499
}
484500
}
485501

0 commit comments

Comments
 (0)