From 7f88b8eb39b9f62e140aaa855fab6433dcec8d32 Mon Sep 17 00:00:00 2001 From: Will Marshall Date: Thu, 20 Mar 2014 14:43:25 +1100 Subject: [PATCH] Switching to separate controllers for ze sidebar --- .../darkswarm/controllers/login_sidebar_controller.js.coffee | 3 +++ .../controllers/signup_sidebar_controller.js.coffee | 3 +++ app/views/shared/_login_panel.html.haml | 5 ++--- 3 files changed, 8 insertions(+), 3 deletions(-) create mode 100644 app/assets/javascripts/darkswarm/controllers/login_sidebar_controller.js.coffee create mode 100644 app/assets/javascripts/darkswarm/controllers/signup_sidebar_controller.js.coffee diff --git a/app/assets/javascripts/darkswarm/controllers/login_sidebar_controller.js.coffee b/app/assets/javascripts/darkswarm/controllers/login_sidebar_controller.js.coffee new file mode 100644 index 0000000000..efd2d7e3e9 --- /dev/null +++ b/app/assets/javascripts/darkswarm/controllers/login_sidebar_controller.js.coffee @@ -0,0 +1,3 @@ +window.LoginSidebarCtrl = Darkswarm.controller "LoginSidebarCtrl", ($scope) -> + $scope.active = -> + $scope.active_sidebar == '/login' diff --git a/app/assets/javascripts/darkswarm/controllers/signup_sidebar_controller.js.coffee b/app/assets/javascripts/darkswarm/controllers/signup_sidebar_controller.js.coffee new file mode 100644 index 0000000000..a577fc6b51 --- /dev/null +++ b/app/assets/javascripts/darkswarm/controllers/signup_sidebar_controller.js.coffee @@ -0,0 +1,3 @@ +window.SignupSidebarCtrl = Darkswarm.controller "SignupSidebarCtrl", ($scope) -> + $scope.active = -> + $scope.active_sidebar == '/signup' diff --git a/app/views/shared/_login_panel.html.haml b/app/views/shared/_login_panel.html.haml index 333c872467..a553add506 100644 --- a/app/views/shared/_login_panel.html.haml +++ b/app/views/shared/_login_panel.html.haml @@ -1,7 +1,6 @@ .login-panel %a{href: "#"} Close - - #login-content{"ng-show" => "active_sidebar == '/login'"} + #login-content{"ng-controller" => "LoginSidebarCtrl", "ng-show" => "active()"} = render "home/login" - #sign-up-content{"ng-show" => "active_sidebar == '/signup'"} + #sign-up-content{"ng-controller" => "SignupSidebarCtrl", "ng-show" => "active()"} = render "home/signup"