Skip to content

Commit 11d61d9

Browse files
committed
Add validation directive
1 parent 9045115 commit 11d61d9

File tree

11 files changed

+21
-71
lines changed

11 files changed

+21
-71
lines changed

RequestAngularTS.Web/RequestAngularTS.Web.csproj

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,9 +100,10 @@
100100
<Folder Include="app\images\" />
101101
</ItemGroup>
102102
<ItemGroup>
103-
<TypeScriptCompile Include="app\blocks\router\blocks.router.module.ts" />
103+
<TypeScriptCompile Include="app\blocks\router\block.router.module.ts" />
104104
<TypeScriptCompile Include="app\blocks\router\RouteResolver.provider.ts" />
105-
<TypeScriptCompile Include="app\directives\ModelValidatorDirective.ts" />
105+
<TypeScriptCompile Include="app\blocks\validation\block.validation.module.ts" />
106+
<TypeScriptCompile Include="app\blocks\validation\ServerErrorDirective.ts" />
106107
<TypeScriptCompile Include="app\directives\HtmlTemplate\HtmlTemplate.directive.ts" />
107108
<TypeScriptCompile Include="app\interfaces\PagebleT.I.ts" />
108109
<TypeScriptCompile Include="app\interfaces\FeatureController.I.ts" />
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
/// <autosync enabled="true" />
2-
/// <reference path="../gulpfile.js" />
2+
/// <reference path="../gulpfile.js" />

RequestAngularTS.Web/app/blocks/router/RouteResolver.provider.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// we use a typescript module because we want to be able to reference the type where it is injected
33
// as a parameter but we don't want to pollute the global namespace
44
// the global variable space with our type.
5-
module blocks.router {
5+
module block.router {
66
export class RouteResolverProvider implements ng.IServiceProvider {
77
// use the ecmascript arrow syntax to lexically bind `this` to the current class instance.
88
public $get = (): RouteResolverProvider=> {
@@ -34,5 +34,5 @@ module blocks.router {
3434

3535
// for this to be injected into a config() call, it must be a provider.
3636
// the suffix "Provider" is automatically appended to the provider Name.
37-
angular.module("blocks.router").provider("routeResolver", RouteResolverProvider);
37+
angular.module("block.router").provider("routeResolver", RouteResolverProvider);
3838
}

RequestAngularTS.Web/app/blocks/router/blocks.router.module.ts

Lines changed: 0 additions & 3 deletions
This file was deleted.

RequestAngularTS.Web/app/directives/ModelValidatorDirective.ts

Lines changed: 0 additions & 56 deletions
This file was deleted.

RequestAngularTS.Web/app/main.ts

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
require.config({
33
paths: {
44
// third party libraries
5-
angular: "components/angular/angular.min",
6-
angularRoute: "components/angular-route/angular-route.min",
5+
angular: "components/angular/angular",
6+
angularRoute: "components/angular-route/angular-route",
77
angularAnimate: "components/angular-animate/angular-animate.min",
88
angularResource: "components/angular-resource/angular-resource",
99
jquery: "components/jquery/dist/jquery.min",
@@ -13,8 +13,10 @@
1313
text: "components/requirejs-text/text",
1414

1515
// block modules
16-
blockRouterModule: "blocks/router/blocks.router.module",
16+
blockRouterModule: "blocks/router/block.router.module",
1717
routeResolver: "blocks/router/RouteResolver.provider",
18+
blockValidationModule: "blocks/validation/block.validation.module",
19+
serverErrorDirective: "blocks/validation/ServerErrorDirective",
1820

1921
// services
2022

@@ -46,7 +48,8 @@
4648
"moment",
4749
"angularToastr",
4850
"blockRouterModule",
49-
"routeResolver"]
51+
"routeResolver",
52+
"serverErrorDirective"]
5053
},
5154
//The appModule defines the feature module dependencies for the application
5255
appModule: {

RequestAngularTS.Web/app/modules/App/App.module.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
// it seems the app module must be exported so that the properties we are using to capture do not "go away"
55
var app: any = angular.module("app", [
66
"app.core",
7-
"blocks.router",
87
"app.purchaseOrder"]);
98

109
// for some reason, we need to hold onto an instance of the injector associated

RequestAngularTS.Web/app/modules/App/App.routes.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
module app.routing {
1010
angular.module("app").config(config);
1111

12-
function config($routeProvider: ng.route.IRouteProvider, routeResolverProvider: blocks.router.RouteResolverProvider) {
12+
function config($routeProvider: ng.route.IRouteProvider, routeResolverProvider: block.router.RouteResolverProvider) {
1313
// routeResolverProvider is a provider rather than a service at this point because we cannot get
1414
// service instances during module configuration.
1515

RequestAngularTS.Web/app/modules/Core/App.Core.module.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,6 @@ angular.module("app.core", [
66
"ngAnimate",
77
"ngResource",
88
"toastr",
9-
"blocks.router"
9+
"block.router",
10+
"block.validation"
1011
]);
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
<div>
22
<h1>Purchase Order</h1>
33
{{vm.purchaseOrder}}
4+
<form data-model-state-configuration="{messageTemplate:'<div class=&quot;input-error&quot;></div>'}">
5+
</form>
46
</div>

RequestAngularTS.Web/package.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@
1717
"gulp-ignore": "^1.2.1",
1818
"gulp-imagemin": "^2.1.0",
1919
"gulp-jasmine": "^2.0.0",
20+
"gulp-jscs": "^1.4.0",
21+
"gulp-jshint": "^1.9.2",
2022
"gulp-merge": "^0.1.0",
2123
"gulp-minify-css": "^0.4.3",
2224
"gulp-ng-annotate": "^0.5.2",
@@ -28,6 +30,7 @@
2830
"gulp-typescript": "^2.4.2",
2931
"gulp-uglify": "^1.1.0",
3032
"gulp-util": "^3.0.4",
33+
"jshint-stylish": "^1.0.1",
3134
"time-require": "^0.1.2",
3235
"tsd": "^0.6.0-beta.5"
3336
},

0 commit comments

Comments
 (0)