From ef98e252b62c1ae99208483a8ff860aeffc08ca5 Mon Sep 17 00:00:00 2001 From: NikolaBorislavovHristov Date: Mon, 9 Dec 2019 14:00:18 +0200 Subject: [PATCH] trailing slash removed from route regexps --- src/common/routesRegexp.js | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/common/routesRegexp.js b/src/common/routesRegexp.js index d3173b300..32ad25ec4 100644 --- a/src/common/routesRegexp.js +++ b/src/common/routesRegexp.js @@ -1,38 +1,38 @@ const routesRegexp = { intro: { - regexp: /^\/intro\/?$/i, + regexp: /^\/intro$/, urlParamsNames: [] }, board: { - regexp: /^\/?$/i, + regexp: /^\/$/, urlParamsNames: [] }, discover: { - regexp: /^\/discover(?:\/([^\/]*)\/([^\/]*)\/([^\/]*))?\/?$/i, + regexp: /^\/discover(?:\/([^\/]*)\/([^\/]*)\/([^\/]*))?$/, urlParamsNames: ['addonTransportUrl', 'type', 'catalogId'] }, library: { - regexp: /^\/library(?:\/([^\/]*))?\/?$/i, + regexp: /^\/library(?:\/([^\/]*))?$/, urlParamsNames: ['type'] }, search: { - regexp: /^\/search\/?$/i, + regexp: /^\/search$/, urlParamsNames: [] }, metadetails: { - regexp: /^\/metadetails\/(?:([^\/]*))\/(?:([^\/]*))(?:\/([^\/]*)\/?)?$/i, + regexp: /^\/metadetails\/([^\/]*)\/([^\/]*)(?:\/([^\/]*))?$/, urlParamsNames: ['type', 'id', 'videoId'] }, addons: { - regexp: /^\/addons(?:\/([^\/]*?))?(?:\/([^\/]*?))?\/?$/i, // TODO both are required or none + regexp: /^\/addons(?:\/([^\/]*)\/([^\/]*))?$/, urlParamsNames: ['category', 'type'] }, settings: { - regexp: /^\/settings\/?$/i, + regexp: /^\/settings$/, urlParamsNames: [] }, player: { - regexp: /^\/player\/(?:([^\/]+?))\/(?:([^\/]+?))\/(?:([^\/]+?))\/(?:([^\/]+?))\/?$/i, + regexp: /^\/player\/([^\/]*)\/([^\/]*)\/([^\/]*)\/([^\/]*)$/, urlParamsNames: ['type', 'id', 'videoId', 'stream'] } };