diff options
| -rw-r--r-- | addons/web/static/lib/owl/owl.js | 69 |
1 files changed, 34 insertions, 35 deletions
diff --git a/addons/web/static/lib/owl/owl.js b/addons/web/static/lib/owl/owl.js index a1b59470e5a..c3ed2b5f567 100644 --- a/addons/web/static/lib/owl/owl.js +++ b/addons/web/static/lib/owl/owl.js @@ -5147,6 +5147,7 @@ `;
const paramRegexp = /\{\{(.*?)\}\}/;
+ const globalParamRegexp = new RegExp(paramRegexp.source, "g");
class Router {
constructor(env, routes, options = { mode: "history" }) {
this.currentRoute = null;
@@ -5168,6 +5169,7 @@ this.validateDestination(partialRoute.redirect);
}
partialRoute.params = partialRoute.path ? findParams(partialRoute.path) : [];
+ partialRoute.extractionRegExp = makeExtractionRegExp(partialRoute.path);
this.routes[partialRoute.name] = partialRoute;
this.routeIds.push(partialRoute.name);
}
@@ -5242,19 +5244,12 @@ }
}
routeToPath(route, params) {
- const path = route.path;
- const parts = path.split("/");
- const l = parts.length;
- for (let i = 0; i < l; i++) {
- const part = parts[i];
- const match = part.match(paramRegexp);
- if (match) {
- const key = match[1].split(".")[0];
- parts[i] = params[key];
- }
- }
const prefix = this.mode === "hash" ? "#" : "";
- return prefix + parts.join("/");
+ return (prefix +
+ route.path.replace(globalParamRegexp, (match, param) => {
+ const [key] = param.split(".");
+ return params[key];
+ }));
}
currentPath() {
let result = this.mode === "history" ? window.location.pathname : window.location.hash.slice(1);
@@ -5311,43 +5306,47 @@ if (path.startsWith("#")) {
path = path.slice(1);
}
- const descrParts = route.path.split("/");
- const targetParts = path.split("/");
- const l = descrParts.length;
- if (l !== targetParts.length) {
+ const paramsMatch = path.match(route.extractionRegExp);
+ if (!paramsMatch) {
return false;
}
const result = {};
- for (let i = 0; i < l; i++) {
- const descr = descrParts[i];
- let target = targetParts[i];
- const match = descr.match(paramRegexp);
- if (match) {
- const [key, suffix] = match[1].split(".");
- if (suffix === "number") {
- target = parseInt(target, 10);
- }
- result[key] = target;
+ route.params.forEach((param, index) => {
+ const [key, suffix] = param.split(".");
+ const paramValue = paramsMatch[index + 1];
+ if (suffix === "number") {
+ return (result[key] = parseInt(paramValue, 10));
}
- else if (descr !== target) {
- return false;
- }
- }
+ return (result[key] = paramValue);
+ });
return result;
}
}
function findParams(str) {
- const globalParamRegexp = /\{\{(.*?)\}\}/g;
const result = [];
let m;
do {
m = globalParamRegexp.exec(str);
if (m) {
- result.push(m[1].split(".")[0]);
+ result.push(m[1]);
}
} while (m);
return result;
}
+ function escapeRegExp(str) {
+ return str.replace(/[-[\]{}()*+?.,\\^$|#\s]/g, "\\$&");
+ }
+ function makeExtractionRegExp(path) {
+ // replace param strings with capture groups so that we can build a regex to match over the path
+ const extractionString = path
+ .split(paramRegexp)
+ .map((part, index) => {
+ return index % 2 ? "(.*)" : escapeRegExp(part);
+ })
+ .join("");
+ // Example: /home/{{param1}}/{{param2}} => ^\/home\/(.*)\/(.*)$
+ return new RegExp(`^${extractionString}$`);
+ }
/**
* This file is the main file packaged by rollup (see rollup.config.js). From
@@ -5388,9 +5387,9 @@ exports.utils = utils;
- __info__.version = '1.2.5';
- __info__.date = '2021-05-18T08:01:47.651Z';
- __info__.hash = '968a546';
+ __info__.version = '1.2.6';
+ __info__.date = '2021-05-19T10:28:32.429Z';
+ __info__.hash = 'e838781';
__info__.url = 'https://github.com/odoo/owl';
|