From ee4eb418ef066261171ac8c7e873113c56e8bf53 Mon Sep 17 00:00:00 2001 From: Piotr Sarnacki Date: Tue, 5 May 2015 13:52:54 +0200 Subject: [PATCH] Move owner's page under main route That way we don't rerender the entire layout each time we change route under "main" --- app/router.coffee | 3 +-- app/routes/owner.coffee | 9 +++++++++ app/templates/layouts/home.hbs | 4 ++-- app/views/home.coffee | 4 ++++ app/views/owner.coffee | 1 - 5 files changed, 16 insertions(+), 5 deletions(-) diff --git a/app/router.coffee b/app/router.coffee index 138d9af4..e96554aa 100644 --- a/app/router.coffee +++ b/app/router.coffee @@ -39,6 +39,7 @@ Router.map -> @route 'repositories', path: '/' @resource 'main', path: '/', -> + @resource 'owner', path: '/:owner' @resource 'getting_started' @route 'recent' @route 'repositories' @@ -71,8 +72,6 @@ Router.map -> @resource 'account', path: '/:login' @route 'info', path: '/info' - @resource 'owner', path: '/:owner' - @route 'error404', path: '/*path' `export default Router` diff --git a/app/routes/owner.coffee b/app/routes/owner.coffee index c8fc139e..0b7a7cd2 100644 --- a/app/routes/owner.coffee +++ b/app/routes/owner.coffee @@ -7,6 +7,15 @@ Route = TravisRoute.extend needsAuth: false # controllerName: 'owner' + renderTemplate: -> + @render 'owner', into: 'main' + + activate: -> + @controllerFor('home').set('ownersPage', true) + + deactivate: -> + @controllerFor('home').set('ownersPage', false) + model: (params) -> owner = {} diff --git a/app/templates/layouts/home.hbs b/app/templates/layouts/home.hbs index cb1e693f..4ae6bd0d 100644 --- a/app/templates/layouts/home.hbs +++ b/app/templates/layouts/home.hbs @@ -1,4 +1,4 @@ -
+
{{render "top"}} @@ -12,7 +12,7 @@
-