summaryrefslogtreecommitdiff
path: root/public/assets/javascripts/ui/_router.js
diff options
context:
space:
mode:
authorJules Laplace <jules@okfoc.us>2014-08-05 18:33:24 -0400
committerJules Laplace <jules@okfoc.us>2014-08-05 18:33:24 -0400
commit1d2c2624c6e84c0f5ea7f7f7fc8e638a6ea5bcdd (patch)
tree0e54d0caf47eeb1448aaf0cdb1c70439d1a065b3 /public/assets/javascripts/ui/_router.js
parent8cf6d964f91354f85a2b831e2b6e313b04a72173 (diff)
parentbac4d6a8c8566814e851452bedf5fa7ce596d54d (diff)
Merge branch 'mobile'
Diffstat (limited to 'public/assets/javascripts/ui/_router.js')
-rw-r--r--public/assets/javascripts/ui/_router.js22
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")