Merge pull request jashkenas#2393 from braddunbar/route-names

Use empty route name for anonymous routes.
ansman · Mar 20, 2013 · 1c17c2e · 1c17c2e
2 parents b0771d9 + 3d43134
commit 1c17c2e
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/backbone.js b/backbone.js
@@ -986,7 +986,11 @@
     //
     route: function(route, name, callback) {
       if (!_.isRegExp(route)) route = this._routeToRegExp(route);
-      if (!callback) callback = _.isFunction(name) ? name : this[name];
+      if (_.isFunction(name)) {
+        callback = name;
+        name = '';
+      }
+      if (!callback) callback = this[name];
       var router = this;
       Backbone.history.route(route, function(fragment) {
         var args = router._extractParameters(route, fragment);

diff --git a/test/router.js b/test/router.js
@@ -286,7 +286,10 @@ $(document).ready(function() {
     equal(router.anything, 'doesnt-match-a-route');
   });
 
-  test("routes (function)", 2, function() {
+  test("routes (function)", 3, function() {
+    router.on('route', function(name) {
+      ok(name === '');
+    });
     equal(ExternalObject.value, 'unset');
     location.replace('http://example.com#function/set');
     Backbone.history.checkUrl();