From 37cd99124dd334123df67b183b016f5ff6b9fff7 Mon Sep 17 00:00:00 2001 From: Jeremy Ashkenas Date: Mon, 8 Nov 2010 13:45:08 -0500 Subject: [PATCH] first draft of splatted params. --- backbone.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/backbone.js b/backbone.js index 123a38b8..82550f6b 100644 --- a/backbone.js +++ b/backbone.js @@ -574,7 +574,7 @@ }; var namedParam = /:([\w\d]+)/g; - var paramMatch = "([^\/]+)"; + var splatParam = /\*([\w\d]+)/g; // Set up all inheritable **Backbone.Controller** properties and methods. _.extend(Backbone.Controller.prototype, Backbone.Events, { @@ -603,7 +603,8 @@ }, _routeToRegExp : function(route) { - return new RegExp('^#' + route.replace(namedParam, paramMatch) + '$'); + route = route.replace(namedParam, "([^\/]*)").replace(splatParam, "(.*?)"); + return new RegExp('^#' + route + '$'); }, _extractArguments : function(route, fragment) {