From f7a5f1788a794d082a05e48f728b22b47a6cc622 Mon Sep 17 00:00:00 2001
From: Igor Minar
Date: Wed, 21 Sep 2011 13:47:17 +0200
Subject: fix($route): fix regex escaping in route matcher

---
 src/service/route.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'src/service/route.js')

diff --git a/src/service/route.js b/src/service/route.js
index 2634eb6c..9f0c7b6d 100644
--- a/src/service/route.js
+++ b/src/service/route.js
@@ -197,14 +197,16 @@ angularServiceInject('$route', function(location, $updateView) {
 
 
   function switchRouteMatcher(on, when, dstName) {
-    var regex = '^' + when.replace(/[\.\\\(\)\^\$]/g, "\$1") + '$',
+    // TODO(i): this code is convoluted and inefficient, we should construct the route matching
+    //   regex only once and then reuse it
+    var regex = '^' + when.replace(/([\.\\\(\)\^\$])/g, "\\$1") + '$',
         params = [],
         dst = {};
     forEach(when.split(/\W/), function(param){
       if (param) {
         var paramRegExp = new RegExp(":" + param + "([\\W])");
         if (regex.match(paramRegExp)) {
-          regex = regex.replace(paramRegExp, "([^\/]*)$1");
+          regex = regex.replace(paramRegExp, "([^\\/]*)$1");
           params.push(param);
         }
       }
-- 
cgit v1.2.3