From a2db66d6b54996e0e931c9bbf8c447a6abf8f411 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Guillermo=20Guti=C3=A9rrez?= Date: Sat, 4 Jun 2022 20:44:19 -0600 Subject: [PATCH] Use RegExp instead of pattern for app route Use RegExp instead of pattern for app route, because Crossroads.js extracts the query string as part of the rest segment. This is because it does not support having both segments as optional. See: https://github.com/millermedeiros/crossroads.js/issues/130 --- src/js/lib/monster.routing.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/js/lib/monster.routing.js b/src/js/lib/monster.routing.js index d749b2dc8..97b22e830 100644 --- a/src/js/lib/monster.routing.js +++ b/src/js/lib/monster.routing.js @@ -104,7 +104,7 @@ define(function(require) { }, addDefaultRoutes: function() { - this.add('apps/{appName}/:rest*::?query:', function(appName, _rest, query) { + this.add(/^apps\/([^/?]+)(?:\/[^?]*)?(\??.*)?$/, function(appName, query) { // not logged in, do nothing to preserve potentially valid route to load after successful login if (!monster.util.isLoggedIn()) { return;