diff --git a/samples/angular/MusicStore/Views/Home/Index.cshtml b/samples/angular/MusicStore/Views/Home/Index.cshtml index acd6a30..0fcf712 100755 --- a/samples/angular/MusicStore/Views/Home/Index.cshtml +++ b/samples/angular/MusicStore/Views/Home/Index.cshtml @@ -17,5 +17,6 @@ + } diff --git a/samples/angular/MusicStore/gulpfile.js b/samples/angular/MusicStore/gulpfile.js index 70895ec..1876432 100755 --- a/samples/angular/MusicStore/gulpfile.js +++ b/samples/angular/MusicStore/gulpfile.js @@ -25,6 +25,7 @@ var config = { require.resolve('angular2/bundles/angular2.dev.js'), require.resolve('angular2/bundles/router.dev.js'), require.resolve('angular2/bundles/http.dev.js'), + require.resolve('angular2-aspnet/bundles/angular2-aspnet.js'), require.resolve('jquery/dist/jquery.js'), require.resolve('bootstrap/dist/js/bootstrap.js') ] diff --git a/samples/angular/MusicStore/package.json b/samples/angular/MusicStore/package.json index 251ee33..e664f3c 100644 --- a/samples/angular/MusicStore/package.json +++ b/samples/angular/MusicStore/package.json @@ -3,6 +3,7 @@ "version": "0.0.0", "dependencies": { "angular2": "2.0.0-alpha.44", + "angular2-aspnet": "0.0.1", "angular2-universal-patched": "^0.5.4", "bootstrap": "^3.3.5", "es6-module-loader": "^0.15.0", diff --git a/samples/angular/MusicStore/wwwroot/ng-app/components/admin/album-edit/AspNetUtil.ts b/samples/angular/MusicStore/wwwroot/ng-app/components/admin/album-edit/AspNetUtil.ts deleted file mode 100644 index c90b406..0000000 --- a/samples/angular/MusicStore/wwwroot/ng-app/components/admin/album-edit/AspNetUtil.ts +++ /dev/null @@ -1,32 +0,0 @@ -import { ControlGroup } from 'angular2/angular2'; -import { Response } from 'angular2/http'; - -// TODO: Factor this out into a separate NPM module -export class Validation { - - public static showValidationErrors(response: ValidationErrorResult | Response, controlGroup: ControlGroup): void { - if (response instanceof Response) { - var httpResponse = response; - response = (httpResponse.json()); - } - - // It's not yet clear whether this is a legitimate and supported use of the ng.ControlGroup API. - // Need feedback from the Angular 2 team on whether there's a better way. - var errors = response; - Object.keys(errors || {}).forEach(key => { - errors[key].forEach(errorMessage => { - // This in particular is rough - if (!controlGroup.controls[key].errors) { - (controlGroup.controls[key])._errors = {}; - } - - controlGroup.controls[key].errors[errorMessage] = true; - }); - }); - } - -} - -export interface ValidationErrorResult { - [propertyName: string]: string[]; -} diff --git a/samples/angular/MusicStore/wwwroot/ng-app/components/admin/album-edit/album-edit.ts b/samples/angular/MusicStore/wwwroot/ng-app/components/admin/album-edit/album-edit.ts index c7a943a..b61f53e 100644 --- a/samples/angular/MusicStore/wwwroot/ng-app/components/admin/album-edit/album-edit.ts +++ b/samples/angular/MusicStore/wwwroot/ng-app/components/admin/album-edit/album-edit.ts @@ -4,7 +4,7 @@ import * as models from '../../../models/models'; import { Http, HTTP_BINDINGS, Headers, Response } from 'angular2/http'; import { AlbumDeletePrompt } from '../album-delete-prompt/album-delete-prompt'; import { FormField } from '../form-field/form-field'; -import * as AspNet from './AspNetUtil'; +import * as AspNet from 'angular2-aspnet'; @ng.Component({ selector: 'album-edit'