diff options
| author | Jules Laplace <jules@okfoc.us> | 2014-08-08 17:07:17 -0400 |
|---|---|---|
| committer | Jules Laplace <jules@okfoc.us> | 2014-08-08 17:07:17 -0400 |
| commit | f837f1af0033fd351474df3beeed4818b1859e5b (patch) | |
| tree | 649ff69b625f6f36892b59adbf4eb74770b4d7e5 /public/assets/javascripts/ui/_router.js | |
| parent | a5025cb5b55e8bd7bcde314a500528dd255394e1 (diff) | |
| parent | 5ee6e8bc71861a2ab7c91a8289107e78fd216fc2 (diff) | |
merge
Diffstat (limited to 'public/assets/javascripts/ui/_router.js')
| -rw-r--r-- | public/assets/javascripts/ui/_router.js | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/public/assets/javascripts/ui/_router.js b/public/assets/javascripts/ui/_router.js index 4ff3581..d07810e 100644 --- a/public/assets/javascripts/ui/_router.js +++ b/public/assets/javascripts/ui/_router.js @@ -36,11 +36,18 @@ var SiteRouter = Router.extend({ "/project": 'projectPicker', "/project/new": 'newProject', "/project/new/:layout": 'projectNewWithLayout', - "/project/:name": 'project', + "/project/:name": 'projectViewer', + "/project/:name/edit": 'projectEditor', "/project/:name/view": 'projectViewer', "/test/wallpaper": 'testWallpaper', }, + + mobileRoutes: { + "/": 'home', + "/profile": 'profile', + "/project/:name": 'projectViewer', + }, initialize: function(){ this.signUpModal = new SignUpModal() @@ -56,6 +63,11 @@ var SiteRouter = Router.extend({ this.route() + if (is_mobile) { + $(".topLinks").hide() + $(".share").hide() + } + $("body").removeClass("loading") }, @@ -123,14 +135,6 @@ var SiteRouter = Router.extend({ this.readerView.load(name) }, -/* - editProject: function(e){ - e && e.preventDefault() - window.history.pushState(null, document.title, "/project/edit") - this.editProjectModal.load() - }, -*/ - signup: function(e){ e && e.preventDefault() window.history.pushState(null, document.title, "/signup") |
