diff options
Diffstat (limited to 'public/assets/javascripts')
| -rw-r--r-- | public/assets/javascripts/rectangles/models/surface.js | 7 | ||||
| -rw-r--r-- | public/assets/javascripts/ui/_router.js | 12 |
2 files changed, 19 insertions, 0 deletions
diff --git a/public/assets/javascripts/rectangles/models/surface.js b/public/assets/javascripts/rectangles/models/surface.js index fc4aae4..f031665 100644 --- a/public/assets/javascripts/rectangles/models/surface.js +++ b/public/assets/javascripts/rectangles/models/surface.js @@ -12,6 +12,7 @@ var Surface = function (face){ this.bounds = new Rect (new vec2(0, 0), new vec2(0, 0)) + this.vec = new Rect (new vec2(0, 0), new vec2(0, 0)) this.faces = [] if (face) { this.add(face) @@ -161,6 +162,12 @@ return this.faces[i] } } + if (x < this.faces[0].x.a) { + return this.faces[0] + } + else { + return this.faces[this.faces.length-1] + } return null } 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") }, |