fix(contentModal): Remove default focus from button

rucken · May 14, 2017 · a619f48 · a619f48
1 parent 144d722
commit a619f48
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 3 deletions.
diff --git a/src/app/app.component.ts b/src/app/app.component.ts
@@ -64,6 +64,7 @@ export class AppComponent extends BaseComponent {
       title = this.translateService.instant('Info');
     }
     const alert: AlertModalComponent = this.app.modals(this.resolver).create(AlertModalComponent);
+    alert.focused = false;
     alert.name = 'error';
     alert.text = title;
     alert.content = content;

diff --git a/src/base/base-modal/base-modal.component.ts b/src/base/base-modal/base-modal.component.ts
@@ -5,6 +5,8 @@ import * as _ from 'lodash';
 
 export class BaseModalComponent extends BaseComponent {
 
+  @Input()
+  focused = true;
   @Input()
   class = '';
   @Input()
@@ -32,7 +34,9 @@ export class BaseModalComponent extends BaseComponent {
     });
     this.modal.onShown.subscribe(() => {
       // todo: fix history.pushState(null, null, this.currentLocation + '/' + _.kebabCase(this.name));
-      this.focus();
+      if (this.focused) {
+        this.focus();
+      }
       this.afterOpen();
     });
     if (this.message.length > 100) {

diff --git a/src/grids/users-grid/account-profile-form/account-profile-form.component.ts b/src/grids/users-grid/account-profile-form/account-profile-form.component.ts
@@ -50,7 +50,6 @@ export class AccountProfileFormComponent extends BaseComponent {
   onSave: EventEmitter<AccountProfileFormComponent | any> = new EventEmitter();
 
   init() {
-    this.focus();
     this.userGroups.user = this.item;
     this.userGroups.mockedItems =
       this.item.groups.map((group: any | Group) => {

diff --git a/src/grids/users-grid/user-modal/user-modal.component.ts b/src/grids/users-grid/user-modal/user-modal.component.ts
@@ -39,7 +39,6 @@ export class UserModalComponent extends BaseResourceModalComponent {
   onSave: EventEmitter<UserModalComponent | any> = new EventEmitter();
 
   afterOpen() {
-    this.focus();
     this.userGroups.user = this.item;
     this.userGroups.mockedItems =
       this.item.groups.map((group: any | Group) => {