From fd6bac7de56f728a89782dc80c78f7d5c21bbc65 Mon Sep 17 00:00:00 2001 From: Caitlin Potter Date: Tue, 21 Jan 2014 18:15:05 -0500 Subject: [PATCH] fix(ngRoute): pipe preceding route param no longer masks ? or * operator Before this change, ```js $routeProvider.when('/foo/:bar|?', { ... }); ``` would not have the expected effect --- the parameter would not be optional, and the pipe would not be included in the parameter name. Following this change, the presence of the pipe operator will typically cause an exception to be thrown due to the fact that the generated regexp is invalid. The net result of this change is that ? and * operators will not be masked, and pipe operators will need to be removed, although it's unexpected that these are being used anywhere. Closes #5920 --- src/ngRoute/route.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ngRoute/route.js b/src/ngRoute/route.js index 34f3f9ec05f1..2d7ce8e40a3e 100644 --- a/src/ngRoute/route.js +++ b/src/ngRoute/route.js @@ -185,7 +185,7 @@ function $RouteProvider(){ path = path .replace(/([().])/g, '\\$1') - .replace(/(\/)?:(\w+)([\?|\*])?/g, function(_, slash, key, option){ + .replace(/(\/)?:(\w+)([\?\*])?/g, function(_, slash, key, option){ var optional = option === '?' ? option : null; var star = option === '*' ? option : null; keys.push({ name: key, optional: !!optional });