diff options
| author | okfprojz <jules+okfprojz@okfoc.us> | 2016-04-13 10:46:52 -0400 |
|---|---|---|
| committer | okfprojz <jules+okfprojz@okfoc.us> | 2016-04-13 10:46:52 -0400 |
| commit | 90657795986d3dbebbcaa488679fc2c246342306 (patch) | |
| tree | a70345976e9105bc2fc824c297ea6fc19c337416 | |
| parent | b21b7537010e7e5b00d94efeacc569a06bf0084c (diff) | |
| parent | 7d60d71f1af243b0b10dd12ea0efc846a998b5c0 (diff) | |
Merge branch 'master' of github.com:okfocus/portfolio
| -rw-r--r-- | index.js | 3 | ||||
| -rw-r--r-- | public/assets/js/lib/ProjectView.js | 3 | ||||
| -rw-r--r-- | public/assets/js/lib/SiteRouter.js | 4 |
3 files changed, 4 insertions, 6 deletions
@@ -54,8 +54,7 @@ var app = okcms.createApp({ views: { '/': viewConfig, - '/page/:id': viewConfig, - '/project/:id': viewConfig, + '/:id': viewConfig, }, services: { diff --git a/public/assets/js/lib/ProjectView.js b/public/assets/js/lib/ProjectView.js index 66bb3b6..2c53cf5 100644 --- a/public/assets/js/lib/ProjectView.js +++ b/public/assets/js/lib/ProjectView.js @@ -88,8 +88,7 @@ var ProjectView = View.extend({ app.router.pushState("/") } else { - app.router.pushState("/project/" + this.project_id) - + app.router.pushState("/" + this.project_id) } this.$images.each(function(){ diff --git a/public/assets/js/lib/SiteRouter.js b/public/assets/js/lib/SiteRouter.js index 7f1cec6..4cd36a9 100644 --- a/public/assets/js/lib/SiteRouter.js +++ b/public/assets/js/lib/SiteRouter.js @@ -5,8 +5,8 @@ var SiteRouter = Router.extend({ routes: { '/': 'home', - '/page/:id': 'project', - '/project/:id': 'project', + '/:id': 'project', + '/:id': 'project', }, initial_route: null, |