1 files changed, 4 insertions, 2 deletions
diff --git a/src/service/route.js b/src/service/route.js
index c12ce99d..73c73b04 100644
--- a/src/service/route.js
+++ b/src/service/route.js
@@ -235,14 +235,16 @@ angularServiceInject('$route', function($location, $routeParams) {
   /////////////////////////////////////////////////////
 
   function switchRouteMatcher(on, when) {
-    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);
         }
       }