Update Typescript AngularJS templates updated to be Typescript 1.0 an…

…d Angular 1.3 compatible * Controller templates: changed to be implemented as functions rather than classes; removed controllerId variable * Factory Template: serviceId variable was removed from the interface definition, since it is a static member of the class * Directive Template: directiveId variable was removed from the interface definition, since it is a static member of the class
ligershark · Feb 15, 2015 · 3498aee · 3498aee
1 parent aeb1093
commit 3498aee
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 34 deletions.
diff --git a/...ePack/ItemTemplates/TypeScript/AngularJs/TypeScript Controller using $scope/controller.ts b/...ePack/ItemTemplates/TypeScript/AngularJs/TypeScript Controller using $scope/controller.ts
@@ -10,24 +10,14 @@ interface I$safeitemname$Scope extends ng.IScope {
     changeGreeting: () => void;
 }
 
-interface I$safeitemname$ {
-    controllerId: string;
-}
-
-class $safeitemname$ implements I$safeitemname$ {
-    static controllerId: string = "$safeitemname$";
-
-    constructor(private $scope: I$safeitemname$Scope, private $http: ng.IHttpService, private $resource: ng.resource.IResourceService) {
-        $scope.greeting = "Hello";
-        $scope.changeGreeting = () => this.changeGreeting();
-    }
-
-    private changeGreeting() {
-        this.$scope.greeting = "Bye";
-    }
+function $safeitemname$($scope: I$safeitemname$Scope, $http: ng.IHttpService, $resource: ng.resource.IResourceService) {
+    $scope.greeting = "Hello";
+    $scope.changeGreeting = (): void => {
+        $scope.greeting = "Bye";
+    };
 }
 
 // Update the app1 variable name to be that of your module variable
-app1.controller($safeitemname$.controllerId, ['$scope', '$http', '$resource', ($scope, $http, $resource) =>
-    new $safeitemname$($scope, $http, $resource)
+app1.controller("$safeitemname$", ['$scope', '$http', '$resource',
+    $safeitemname$
 ]);
diff --git a/TemplatePack/ItemTemplates/TypeScript/AngularJs/TypeScript Controller/controller.ts b/TemplatePack/ItemTemplates/TypeScript/AngularJs/TypeScript Controller/controller.ts
@@ -5,29 +5,22 @@
 /// <reference path='/Scripts/typings/angularjs/angular.d.ts'/>
 /// <reference path='/Scripts/typings/angularjs/angular-resource.d.ts'/>
 
-interface I$safeitemname$Scope extends ng.IScope {
-    vm: $safeitemname$;
-}
-
 interface I$safeitemname$ {
     greeting: string;
-    controllerId: string;
     changeGreeting: () => void;
 }
 
-class $safeitemname$ implements I$safeitemname$ {
-    static controllerId: string = "$safeitemname$";
-    greeting = "Hello";
-
-    constructor(private $scope: I$safeitemname$Scope, private $http: ng.IHttpService, private $resource: ng.resource.IResourceService) {
-    }
+function $safeitemname$($scope: ng.IScope, $http: ng.IHttpService, $resource: ng.resource.IResourceService){
+    var vm: I$safeitemname$ = this;
+    vm.greeting = "Hello";
 
-    changeGreeting() {
-        this.greeting = "Bye";
+    vm.changeGreeting=(): void =>{
+        vm.greeting = "Bye";
     }
 }
 
+
 // Update the app1 variable name to be that of your module variable
-app1.controller($safeitemname$.controllerId, ['$scope', '$http', '$resource', ($scope, $http, $resource) =>
-    new $safeitemname$($scope, $http, $resource)
+app1.controller("$safeitemname$", ['$scope', '$http', '$resource', 
+    $safeitemname$
 ]);
diff --git a/TemplatePack/ItemTemplates/TypeScript/AngularJs/TypeScript Directive/directive.ts b/TemplatePack/ItemTemplates/TypeScript/AngularJs/TypeScript Directive/directive.ts
@@ -6,7 +6,6 @@
 /// <reference path='/Scripts/typings/angularjs/angular-resource.d.ts'/>
 
 interface I$safeitemname$ extends ng.IDirective {
-    directiveId: string;
 }
 
 interface I$safeitemname$Scope extends ng.IScope {

diff --git a/TemplatePack/ItemTemplates/TypeScript/AngularJs/TypeScript Factory/factory.ts b/TemplatePack/ItemTemplates/TypeScript/AngularJs/TypeScript Factory/factory.ts
@@ -7,7 +7,6 @@
 
 interface I$safeitemname$ {
     greeting: string;
-    serviceId: string;
     changeGreeting: () => void;
 }