diff options
| -rw-r--r-- | public/assets/javascripts/ui/_router.js | 12 | ||||
| -rw-r--r-- | public/assets/test/intersect2.html | 2 |
2 files changed, 13 insertions, 1 deletions
diff --git a/public/assets/javascripts/ui/_router.js b/public/assets/javascripts/ui/_router.js index 0c95664..d5a8e7f 100644 --- a/public/assets/javascripts/ui/_router.js +++ b/public/assets/javascripts/ui/_router.js @@ -18,6 +18,7 @@ var SiteRouter = Router.extend({ routes: { "/": 'home', + "/home": 'home', "/login": 'signin', "/signup": 'signup', @@ -45,7 +46,16 @@ var SiteRouter = Router.extend({ mobileRoutes: { "/": 'home', "/home": 'home', + "/login": 'signin', + "/signup": 'signup', + "/auth/usernameTaken": 'usernameTaken', + "/auth/password": 'passwordReset', + "/auth/forgotPassword": 'passwordForgot', + "/profile": 'profile', + "/profile/edit": 'editProfile', + "/profile/:name": 'profile', + "/project/:name": 'projectViewer', }, @@ -63,10 +73,12 @@ var SiteRouter = Router.extend({ this.route() + /* if (is_mobile) { $(".topLinks").hide() $(".share").hide() } + */ $("body").removeClass("loading") }, diff --git a/public/assets/test/intersect2.html b/public/assets/test/intersect2.html index fade288..3df9f30 100644 --- a/public/assets/test/intersect2.html +++ b/public/assets/test/intersect2.html @@ -55,7 +55,7 @@ var rect_room = new Room({ id: "rect", rect: rect, height: 2 }) var east_room = new Room({ id: "east", rect: east, height: 2 }) var corner_room = new Room({ id: "corner", rect: corner, height: 2 }) var peninsula_room = new Room({ id: "peninsula", rect: peninsula, height: 3 }) -var peninsula2_room = new Room({ id: "peninsula2", rect: peninsula2, height: 3 }) +var peninsula2_room = new Room({ id: "peninsula2", rect: peninsula2, height: 1 }) Rooms.add( rect_room ) Rooms.add( east_room ) |