Update vendors, minified builds, and rebuild docs.

Former-commit-id: 9be99ca3c78a1a35fd13138398c48ab4a4b35f11
This commit is contained in:
John-David Dalton
2013-01-12 20:02:16 -08:00
parent 2d202e90b7
commit e4cb7112cf
12 changed files with 222 additions and 170 deletions

View File

@@ -69,6 +69,7 @@ $(document).ready(function() {
"contacts": "contacts",
"contacts/new": "newContact",
"contacts/:id": "loadContact",
"route-event/:arg": "routeEvent",
"optional(/:item)": "optionalItem",
"named/optional/(y:z)": "namedOptional",
"splat/*args/end": "splat",
@@ -132,6 +133,9 @@ $(document).ready(function() {
namedOptional: function(z) {
this.z = z;
},
routeEvent: function(arg) {
}
});
@@ -516,4 +520,13 @@ $(document).ready(function() {
strictEqual(router.z, '123');
});
test("#2062 - Trigger 'route' event on router instance.", 2, function() {
router.on('route', function(name, args) {
strictEqual(name, 'routeEvent');
deepEqual(args, ['x']);
});
location.replace('http://example.com#route-event/x');
Backbone.history.checkUrl();
});
});