Correct injection for validationService.

Facilitate minified testing.
mdekrey · Apr 5, 2015 · cd303f1 · cd303f1
1 parent 566c934
commit cd303f1
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 5 deletions.
diff --git a/ResponsivePath.Validation.Scripts/Assets/Scripts/validationDirective.ts b/ResponsivePath.Validation.Scripts/Assets/Scripts/validationDirective.ts
@@ -4,7 +4,7 @@
         restrict: string = 'A';
         require: string = 'ngModel';
         private validation: ValidationService;
-
+		
         constructor(validation: ValidationService) {
             this.validation = validation;
         }

diff --git a/ResponsivePath.Validation.Scripts/Assets/Scripts/validationService.ts b/ResponsivePath.Validation.Scripts/Assets/Scripts/validationService.ts
@@ -55,6 +55,7 @@
             delete this.ensureValidation(scope).data[dotNetName];
         }
 
+		static $inject = ['$injector','$sce','getValidationType'];
         constructor($injector: ng.auto.IInjectorService, $sce: IMySCEService, getValidationType: (keyName: string) => ValidationType) {
             this.$injector = $injector;
             this.$sce = $sce;

diff --git a/ResponsivePath.Validation.Scripts/gruntfile.js b/ResponsivePath.Validation.Scripts/gruntfile.js
@@ -3,13 +3,19 @@ module.exports = function (grunt) {
 	grunt.initConfig({
 		uglify: {
 			scripts: {
-				files: { '../js/angular.unobtrusive.validation.min.js': ['../js/angular.unobtrusive.validation.js'] },
+				files: {
+					'../js/angular.unobtrusive.validation.min.js': ['../js/angular.unobtrusive.validation.js'],
+					'wwwroot/Scripts/angular.unobtrusive.validation.min.js': ['wwwroot/Scripts/angular.unobtrusive.validation.js'],
+				},
 				options: {
 					sourceMap: true,
 				}
 			},
 			templates: {
-				files: { '../js/angular.unobtrusive.validation.tpls.min.js': ['../js/angular.unobtrusive.validation.tpls.js'] },
+				files: {
+					'../js/angular.unobtrusive.validation.tpls.min.js': ['../js/angular.unobtrusive.validation.tpls.js'],
+					'wwwroot/Scripts/angular.unobtrusive.validation.tpls.min.js': ['wwwroot/Scripts/angular.unobtrusive.validation.tpls.js'],
+				},
 				options: {
 					sourceMap: true,
 				}

diff --git a/js/angular.unobtrusive.validation.js b/js/angular.unobtrusive.validation.js
@@ -546,6 +546,7 @@ var ResponsivePath;
                     delete this.ensureValidation(scope).messages[dotNetName];
                     delete this.ensureValidation(scope).data[dotNetName];
                 };
+                ValidationService.$inject = ['$injector', '$sce', 'getValidationType'];
                 return ValidationService;
             })();
             Unobtrusive.ValidationService = ValidationService;

diff --git a/js/angular.unobtrusive.validation.min.js b/js/angular.unobtrusive.validation.min.js
diff --git a/js/angular.unobtrusive.validation.min.js.map b/js/angular.unobtrusive.validation.min.js.map
diff --git a/typings/angular.unobtrusive.validation.d.ts b/typings/angular.unobtrusive.validation.d.ts
@@ -106,6 +106,7 @@ declare module ResponsivePath.Validation.Unobtrusive {
         hasCancelledSuppress: (scope: ng.IScope) => boolean;
         cancelSuppress(scope: ng.IScope): void;
         clearDotNetName(scope: ng.IScope, dotNetName: string): void;
+        static $inject: string[];
         constructor($injector: ng.auto.IInjectorService, $sce: IMySCEService, getValidationType: (keyName: string) => ValidationType);
     }
 }