From d0fa3d8f19892caefcaedecc9061bfeed001cea2 Mon Sep 17 00:00:00 2001 From: mauriziovitale84 Date: Thu, 23 Jun 2016 10:14:18 +0100 Subject: [PATCH 1/3] Fix error position --- .../src/components/alfresco-login.component.html | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ng2-components/ng2-alfresco-login/src/components/alfresco-login.component.html b/ng2-components/ng2-alfresco-login/src/components/alfresco-login.component.html index 709f9e39f9..42e6bfdd89 100644 --- a/ng2-components/ng2-alfresco-login/src/components/alfresco-login.component.html +++ b/ng2-components/ng2-alfresco-login/src/components/alfresco-login.component.html @@ -14,8 +14,8 @@ class="center mdl-textfield mdl-js-textfield mdl-textfield--floating-label "> - - {{formError.username | translate }} + + {{formError.username | translate }} @@ -35,8 +35,8 @@ - - {{formError.password | translate }} + + {{formError.password | translate }}
From 3e9d50bdca3f651ed93d1d7eebbec4c84ca38d36 Mon Sep 17 00:00:00 2001 From: mauriziovitale84 Date: Thu, 23 Jun 2016 11:52:08 +0100 Subject: [PATCH 2/3] Fix error messages position --- .../src/components/alfresco-login.component.html | 5 ++--- .../src/components/alfresco-login.component.ts | 7 ++++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ng2-components/ng2-alfresco-login/src/components/alfresco-login.component.html b/ng2-components/ng2-alfresco-login/src/components/alfresco-login.component.html index 42e6bfdd89..26eba18504 100644 --- a/ng2-components/ng2-alfresco-login/src/components/alfresco-login.component.html +++ b/ng2-components/ng2-alfresco-login/src/components/alfresco-login.component.html @@ -18,8 +18,7 @@ {{formError.username | translate }}
- -
@@ -35,7 +34,7 @@ - + {{formError.password | translate }}
diff --git a/ng2-components/ng2-alfresco-login/src/components/alfresco-login.component.ts b/ng2-components/ng2-alfresco-login/src/components/alfresco-login.component.ts index 054ea0f9f4..5a9208e2de 100644 --- a/ng2-components/ng2-alfresco-login/src/components/alfresco-login.component.ts +++ b/ng2-components/ng2-alfresco-login/src/components/alfresco-login.component.ts @@ -89,7 +89,7 @@ export class AlfrescoLoginComponent { this.form.valueChanges.subscribe(data => this.onValueChanged(data)); - this.onValueChanged(null); + // this.onValueChanged(null); } /** @@ -131,7 +131,8 @@ export class AlfrescoLoginComponent { for (let field in this.formError) { if (field) { this.formError[field] = ''; - let hasError = this.form.controls[field].errors || (this.form.controls[field].dirty && !this.form.controls[field].valid); + let hasError = (this.form.controls[field].errors && !this.form.controls[field].pristine) || + (this.form.controls[field].dirty && !this.form.controls[field].valid); if (hasError) { for (let key in this.form.controls[field].errors) { if (key) { @@ -164,6 +165,6 @@ export class AlfrescoLoginComponent { if (typeof componentHandler !== 'undefined') { componentHandler.upgradeAllRegistered(); } - return !field.valid; + return !field.valid && field.dirty && !field.pristine; } } From d0d0ad0bc4ee1bb4daaba1bd0508b7799b91a329 Mon Sep 17 00:00:00 2001 From: mauriziovitale84 Date: Thu, 23 Jun 2016 16:48:12 +0100 Subject: [PATCH 3/3] Fix broken login test --- .../components/alfresco-login.component.html | 8 +- .../alfresco-login.component.spec.ts | 760 +++++++++++------- 2 files changed, 461 insertions(+), 307 deletions(-) diff --git a/ng2-components/ng2-alfresco-login/src/components/alfresco-login.component.html b/ng2-components/ng2-alfresco-login/src/components/alfresco-login.component.html index 26eba18504..7401b36f00 100644 --- a/ng2-components/ng2-alfresco-login/src/components/alfresco-login.component.html +++ b/ng2-components/ng2-alfresco-login/src/components/alfresco-login.component.html @@ -39,21 +39,21 @@

-