From e845a427255da1a66c91dbc098e7e30b54e2c8f3 Mon Sep 17 00:00:00 2001 From: Mehdy Dara Date: Tue, 7 Apr 2015 16:49:04 +0200 Subject: [PATCH] Coffee: use controllerAs --- app/templates/src/app/_ngroute/__ngroute.coffee | 1 + app/templates/src/app/_uirouter/__uirouter.coffee | 5 +++-- .../src/app/components/navbar/_navbar.controller.coffee | 5 +++-- app/templates/src/app/main/_main.controller.coffee | 8 +++++--- app/templates/src/app/main/_main.controller.spec.js | 2 +- 5 files changed, 13 insertions(+), 8 deletions(-) diff --git a/app/templates/src/app/_ngroute/__ngroute.coffee b/app/templates/src/app/_ngroute/__ngroute.coffee index 1afc0687..1c1fffda 100644 --- a/app/templates/src/app/_ngroute/__ngroute.coffee +++ b/app/templates/src/app/_ngroute/__ngroute.coffee @@ -4,5 +4,6 @@ .when "/", templateUrl: "app/main/main.html" controller: "MainController" + controllerAs: "main" .otherwise redirectTo: "/" diff --git a/app/templates/src/app/_uirouter/__uirouter.coffee b/app/templates/src/app/_uirouter/__uirouter.coffee index c872ac90..6212c4a7 100644 --- a/app/templates/src/app/_uirouter/__uirouter.coffee +++ b/app/templates/src/app/_uirouter/__uirouter.coffee @@ -2,8 +2,9 @@ .config ($stateProvider, $urlRouterProvider) -> $stateProvider .state "home", - url: "/", - templateUrl: "app/main/main.html", + url: "/" + templateUrl: "app/main/main.html" controller: "MainController" + controllerAs: "main" $urlRouterProvider.otherwise '/' diff --git a/app/templates/src/app/components/navbar/_navbar.controller.coffee b/app/templates/src/app/components/navbar/_navbar.controller.coffee index 77e192c1..2940cc7f 100644 --- a/app/templates/src/app/components/navbar/_navbar.controller.coffee +++ b/app/templates/src/app/components/navbar/_navbar.controller.coffee @@ -1,3 +1,4 @@ angular.module "<%= appName %>" - .controller "NavbarController", ($scope) -> - $scope.date = new Date() + .controller "NavbarController", () -> + vm = this + vm.date = new Date() diff --git a/app/templates/src/app/main/_main.controller.coffee b/app/templates/src/app/main/_main.controller.coffee index a545fc40..e7786e84 100644 --- a/app/templates/src/app/main/_main.controller.coffee +++ b/app/templates/src/app/main/_main.controller.coffee @@ -1,5 +1,7 @@ angular.module "<%= appName %>" - .controller "MainController", ($scope) -> - $scope.awesomeThings = <%= technologies %> - angular.forEach $scope.awesomeThings, (awesomeThing) -> + .controller "MainController", () -> + vm = this + vm.awesomeThings = <%= technologies %> + angular.forEach vm.awesomeThings, (awesomeThing) -> awesomeThing.rank = Math.random() + return diff --git a/app/templates/src/app/main/_main.controller.spec.js b/app/templates/src/app/main/_main.controller.spec.js index 38d8df22..67a69e46 100644 --- a/app/templates/src/app/main/_main.controller.spec.js +++ b/app/templates/src/app/main/_main.controller.spec.js @@ -10,7 +10,7 @@ describe('controllers', function(){ })); it('should define more than 5 awesome things', inject(function($controller) { -<% if (props.jsPreprocessor.key === 'none' || props.jsPreprocessor.srcExtension === 'es6') { %> +<% if (props.jsPreprocessor.key === 'none' || props.jsPreprocessor.srcExtension === 'es6' || props.jsPreprocessor.srcExtension === 'coffee') { %> var vm = $controller('MainController', { $scope: scope });