Merge pull request #232 from udos86/development

Development
udos86 · Jan 3, 2017 · 387f034 · 387f034
2 parents 55c30b8 + d4b562b
commit 387f034
Show file tree

Hide file tree

Showing 7 changed files with 27 additions and 9 deletions.
diff --git a/example/app/app.component.html b/example/app/app.component.html
@@ -13,7 +13,7 @@ <h1 class="text-center">
         <a routerLink="/example-bootstrap">Bootstrap UI</a>
         <a routerLink="/example-foundation">Foundation UI</a>
         <a routerLink="/example-material">Material UI</a>
-        <a routerLink="/example-kendo">Kendo UI</a>
+        <!--<a routerLink="/example-kendo">Kendo UI</a>-->
         <a routerLink="/example-primeng">PrimeNG UI</a>
         <a routerLink="/example-async">Async</a>
 

diff --git a/example/app/app.module.ts b/example/app/app.module.ts
@@ -8,17 +8,18 @@ import { DynamicFormsCoreModule } from "@ng2-dynamic-forms/core";
 import { DynamicFormsBasicUIModule } from "@ng2-dynamic-forms/ui-basic";
 import { DynamicFormsBootstrapUIModule } from "@ng2-dynamic-forms/ui-bootstrap";
 import { DynamicFormsFoundationUIModule } from "@ng2-dynamic-forms/ui-foundation";
-import { DynamicFormsKendoUIModule } from "@ng2-dynamic-forms/ui-kendo";
+//import { DynamicFormsKendoUIModule } from "@ng2-dynamic-forms/ui-kendo";
 import { DynamicFormsMaterialUIModule } from "@ng2-dynamic-forms/ui-material";
 import { DynamicFormsPrimeNGUIModule } from "@ng2-dynamic-forms/ui-primeng";
 
 import { BasicExampleComponent } from "./basic/basic-example.component";
 import { BootstrapExampleComponent } from "./bootstrap/bootstrap-example.component";
 import { FoundationExampleComponent } from "./foundation/foundation-example.component";
-import { KendoExampleComponent } from "./kendo/kendo-example.component";
+//import { KendoExampleComponent } from "./kendo/kendo-example.component";
 import { MaterialExampleComponent } from "./material/material-example.component";
 import { PrimeNGExampleComponent } from "./primeng/primeng-example.component";
 
+import { ValidationMessageComponent } from "./validation-message/validation-message.component";
 import { AppRoutingModule } from './app.routing.module';
 import { AppComponent } from './app.component';
 
@@ -41,7 +42,7 @@ function testValidator(formControl: FormControl) {
         DynamicFormsBasicUIModule,
         DynamicFormsBootstrapUIModule,
         DynamicFormsFoundationUIModule,
-        DynamicFormsKendoUIModule,
+        //DynamicFormsKendoUIModule,
         DynamicFormsMaterialUIModule,
         DynamicFormsPrimeNGUIModule,
         MaterialModule.forRoot()
@@ -50,9 +51,10 @@ function testValidator(formControl: FormControl) {
         BasicExampleComponent,
         BootstrapExampleComponent,
         FoundationExampleComponent,
-        KendoExampleComponent,
+        //KendoExampleComponent,
         MaterialExampleComponent,
         PrimeNGExampleComponent,
+        ValidationMessageComponent,
         AppComponent
     ],
     providers: [

diff --git a/example/app/app.routing.module.ts b/example/app/app.routing.module.ts
@@ -2,7 +2,7 @@ import { RouterModule, Route } from "@angular/router";
 import { BasicExampleComponent } from "./basic/basic-example.component";
 import { BootstrapExampleComponent } from "./bootstrap/bootstrap-example.component";
 import { FoundationExampleComponent } from "./foundation/foundation-example.component";
-import { KendoExampleComponent } from "./kendo/kendo-example.component";
+//import { KendoExampleComponent } from "./kendo/kendo-example.component";
 import { MaterialExampleComponent } from "./material/material-example.component";
 import { PrimeNGExampleComponent } from "./primeng/primeng-example.component";
 import { NgModule } from "@angular/core";
@@ -49,6 +49,7 @@ const APP_ROUTES: Array<Route> = [
             bgColor: "#009688"
         }
     },
+    /*
     {
         path: "example-kendo",
         component: KendoExampleComponent,
@@ -58,6 +59,7 @@ const APP_ROUTES: Array<Route> = [
             bgColor: "#ff5747"
         }
     },
+    */
     {
         path: "example-primeng",
         component: PrimeNGExampleComponent,

diff --git a/example/app/bootstrap/bootstrap-example.component.html b/example/app/bootstrap/bootstrap-example.component.html
@@ -5,7 +5,6 @@
         <dynamic-form-bootstrap-control *ngFor="let controlModel of formModel"
                                         [controlGroup]="formGroup"
                                         [model]="controlModel"
-                                        [hasErrorMessaging]="controlModel.hasErrorMessages"
                                         (blur)="onBlur($event)"
                                         (change)="onChange($event)"
                                         (focus)="onFocus($event)">

diff --git a/example/app/validation-message/validation-message.component.html b/example/app/validation-message/validation-message.component.html
@@ -0,0 +1 @@
+<span *ngIf="control && control.hasError('required') && control.touched">Field is required</span>
diff --git a/example/app/validation-message/validation-message.component.ts b/example/app/validation-message/validation-message.component.ts
@@ -0,0 +1,14 @@
+import { Component, Input } from "@angular/core";
+import { FormControl } from "@angular/forms";
+
+@Component({
+
+    moduleId: module.id,
+    selector: "validation-message",
+    templateUrl: "./validation-message.component.html"
+})
+
+export class ValidationMessageComponent {
+
+    @Input() control: FormControl;
+}
diff --git a/package.json b/package.json
@@ -63,7 +63,7 @@
     "@types/core-js": "^0.9.35",
     "@types/hammerjs": "^2.0.34",
     "@types/jasmine": "^2.5.40",
-    "@types/node": "^6.0.54",
+    "@types/node": "^6.0.55",
     "@types/reflect-metadata": "^0.0.5",
     "codelyzer": "^2.0.0-beta.4",
     "dateformat": "^2.0.0",
@@ -89,7 +89,7 @@
     "lite-server": "^2.2.2",
     "phantomjs-prebuilt": "^2.1.14",
     "protractor": "^4.0.14",
-    "rollup": "^0.38.3",
+    "rollup": "^0.39.2",
     "rollup-plugin-uglify": "^1.0.1",
     "run-sequence": "^1.2.2",
     "systemjs-builder": "^0.15.34",