diff options
| author | Jules Laplace <jules@okfoc.us> | 2015-08-06 13:04:24 -0400 |
|---|---|---|
| committer | Jules Laplace <jules@okfoc.us> | 2015-08-06 13:04:24 -0400 |
| commit | 277e73e9d7e118b5cc1bd5888eb502b3d7380ec8 (patch) | |
| tree | f1b2f03ad2728cfa2a8b10fcbf10f5f3030dc216 /public/js/vendor/view/router.js | |
| parent | fd3e6661d8911fc0ede063ade5c094c7188443e5 (diff) | |
| parent | 18ebdc7abb9982ceeba1aac651b1c874fad2b6c0 (diff) | |
Merge branch 'master' of ghghgh.us:asdf-yt
Diffstat (limited to 'public/js/vendor/view/router.js')
| -rw-r--r-- | public/js/vendor/view/router.js | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/public/js/vendor/view/router.js b/public/js/vendor/view/router.js index 28905b2..ac2b5d4 100644 --- a/public/js/vendor/view/router.js +++ b/public/js/vendor/view/router.js @@ -15,7 +15,7 @@ var Router = View.extend({ } if (pathname in routes) { - this[this.routes[pathname]](null) + this[this.routes[pathname]]() return } @@ -27,27 +27,27 @@ var Router = View.extend({ var routePath = route.split("/") if (routePath[1] == path[1]) { if (routePath[2] && routePath[2].indexOf(":") !== -1 && path[2] && (path[3] === routePath[3]) ) { - this[this.routes[route]](null, path[2]) + this[this.routes[route]](path[2]) return } else if (routePath[2] == path[2]) { if (routePath[3] && path[3]) { if (routePath[3].indexOf(":") !== -1) { - this[this.routes[route]](null, path[3]) + this[this.routes[route]](path[3]) return } else if (routePath[3] == path[3]) { - this[this.routes[route]](null) + this[this.routes[route]]() return } } else if (! routePath[3] && ! path[3]) { - this[this.routes[route]](null) + this[this.routes[route]]() return } } else if (! routePath[2] && (! path[2].length || ! path[2])) { - this[this.routes[route]](null) + this[this.routes[route]]() return } } |
