switch to controller as for typescript

Swiip · Apr 10, 2015 · 638b75c · 638b75c
1 parent 8dcc39f
commit 638b75c
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 27 deletions.
diff --git a/app/templates/src/app/_ngroute/__ngroute.ts b/app/templates/src/app/_ngroute/__ngroute.ts
@@ -3,7 +3,8 @@
     $routeProvider
       .when('/', {
         templateUrl: 'app/main/main.html',
-        controller: 'MainController'
+        controller: 'MainController',
+        controllerAs: 'main'
       })
       .otherwise({
         redirectTo: '/'

diff --git a/app/templates/src/app/_uirouter/__uirouter.ts b/app/templates/src/app/_uirouter/__uirouter.ts
@@ -4,7 +4,8 @@
       .state('home', {
         url: '/',
         templateUrl: 'app/main/main.html',
-        controller: 'MainController'
+        controller: 'MainController',
+        controllerAs: 'main'
       });
 
     $urlRouterProvider.otherwise('/');

diff --git a/app/templates/src/app/components/navbar/_navbar.controller.ts b/app/templates/src/app/components/navbar/_navbar.controller.ts
@@ -1,14 +1,14 @@
 module <%= appName %> {
   'use strict';
 
-  interface INavbarScope extends ng.IScope {
-    date: Date
-  }
-
   export class NavbarController {
+    public date: Date;
+
     /* @ngInject */
-    constructor ($scope: INavbarScope) {
-      $scope.date = new Date();
+    constructor () {
+      var vm = this;
+
+      vm.date = new Date();
     }
   }
 

diff --git a/app/templates/src/app/main/_main.controller.spec.js b/app/templates/src/app/main/_main.controller.spec.js
@@ -10,20 +10,9 @@ describe('controllers', function(){
   }));
 
   it('should define more than 5 awesome things', inject(function($controller) {
-<% if (props.jsPreprocessor.key === 'none' || props.jsPreprocessor.srcExtension === 'es6' || props.jsPreprocessor.srcExtension === 'coffee') { %>
-    var vm = $controller('MainController', {
-      $scope: scope
-    });
+    var vm = $controller('MainController');
 
     expect(angular.isArray(vm.awesomeThings)).toBeTruthy();
     expect(vm.awesomeThings.length > 5).toBeTruthy();
-<% } else { %>
-    $controller('MainController', {
-      $scope: scope
-    });
-
-    expect(angular.isArray(scope.awesomeThings)).toBeTruthy();
-    expect(scope.awesomeThings.length > 5).toBeTruthy();
-<% }%>
   }));
 });
diff --git a/app/templates/src/app/main/_main.controller.ts b/app/templates/src/app/main/_main.controller.ts
@@ -17,19 +17,19 @@ module <%= appName %> {
     }
   }
 
-  interface IMainScope extends ng.IScope {
-    awesomeThings: Thing[]
-  }
-
   export class MainController {
+    public awesomeThings: Thing[];
+
     /* @ngInject */
-    constructor ($scope: IMainScope) {
+    constructor () {
+      var vm = this;
+
       var awesomeThings = <%= technologies %>;
 
-      $scope.awesomeThings = new Array<Thing>();
+      vm.awesomeThings = new Array<Thing>();
 
       awesomeThings.forEach(function(awesomeThing: Thing) {
-        $scope.awesomeThings.push(awesomeThing);
+        vm.awesomeThings.push(awesomeThing);
       });
     }
   }