Do not overwrite this.routes in #_bindRoutes

jashkenas · Jul 7, 2015 · 60a5e6e · 60a5e6e
1 parent 5f871af
commit 60a5e6e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/backbone.js b/backbone.js
@@ -1477,11 +1477,10 @@
     // order of the routes here to support behavior where the most general
     // routes can be defined at the bottom of the route map.
     _bindRoutes: function() {
-      if (!this.routes) return;
-      this.routes = _.result(this, 'routes');
-      var route, routes = _.keys(this.routes);
-      while ((route = routes.pop()) != null) {
-        this.route(route, this.routes[route]);
+      var routes = _.result(this, 'routes');
+      var keys = _.keys(routes);
+      for (var i = keys.length - 1; i >= 0; i--) {
+        this.route(keys[i], routes[keys[i]]);
       }
     },
 

diff --git a/test/router.js b/test/router.js
@@ -657,7 +657,7 @@
     });
 
     var router = new RouterExtended();
-    deepEqual({home: "root", index: "index.html", show: "show", search: "search"}, router.routes);
+    deepEqual({home: "root", index: "index.html", show: "show", search: "search"}, router.routes());
   });
 
   test("#2538 - hashChange to pushState only if both requested.", 0, function() {