From 6b78678c45116b686b4989b940a10dfd1ef8e6e0 Mon Sep 17 00:00:00 2001 From: Lukas Metzger Date: Mon, 9 Apr 2018 17:25:54 +0200 Subject: [PATCH] Fixed file names for style guide and event propagation when deleting domain --- frontend/src/app/app.module.ts | 6 ++++-- frontend/src/app/pages/domains/domains.component.html | 2 +- frontend/src/app/pages/password/password.component.ts | 2 +- .../utils/{Focus.directive.ts => focus.directive.ts} | 0 ...Validation.util.ts => password-validation.util.ts} | 0 .../src/app/utils/stop-propagate-click.directive.ts | 11 +++++++++++ 6 files changed, 17 insertions(+), 4 deletions(-) rename frontend/src/app/utils/{Focus.directive.ts => focus.directive.ts} (100%) rename frontend/src/app/utils/{PasswordValidation.util.ts => password-validation.util.ts} (100%) create mode 100644 frontend/src/app/utils/stop-propagate-click.directive.ts diff --git a/frontend/src/app/app.module.ts b/frontend/src/app/app.module.ts index 0cdc45a..e569420 100644 --- a/frontend/src/app/app.module.ts +++ b/frontend/src/app/app.module.ts @@ -1,9 +1,10 @@ +import { StopPropagateClickDirective } from './utils/stop-propagate-click.directive'; import { PagesizeComponent } from './partials/pagesize/pagesize.component'; import { PagingComponent } from './partials/paging/paging.component'; import { DomainsOperation } from './operations/domains.operations'; import { PasswordOperation } from './operations/password.operations'; import { AuthGuard } from './services/auth-guard.service'; -import { FocusDirective } from './utils/Focus.directive'; +import { FocusDirective } from './utils/focus.directive'; import { BrowserModule } from '@angular/platform-browser'; import { NgModule } from '@angular/core'; import { ReactiveFormsModule } from '@angular/forms'; @@ -46,7 +47,8 @@ import { SelectComponent } from './partials/select/select.component'; PagesizeComponent, EditSlaveComponent, EditAuthComponent, - SelectComponent + SelectComponent, + StopPropagateClickDirective ], imports: [ BrowserModule, diff --git a/frontend/src/app/pages/domains/domains.component.html b/frontend/src/app/pages/domains/domains.component.html index aad2428..1b426d6 100644 --- a/frontend/src/app/pages/domains/domains.component.html +++ b/frontend/src/app/pages/domains/domains.component.html @@ -39,7 +39,7 @@ {{ domain.type }} {{ domain.records }} - + diff --git a/frontend/src/app/pages/password/password.component.ts b/frontend/src/app/pages/password/password.component.ts index b5c649d..8d86c32 100644 --- a/frontend/src/app/pages/password/password.component.ts +++ b/frontend/src/app/pages/password/password.component.ts @@ -1,5 +1,5 @@ import { PasswordOperation } from './../../operations/password.operations'; -import { PasswordValidationUtil } from './../../utils/PasswordValidation.util'; +import { PasswordValidationUtil } from './../../utils/password-validation.util'; import { FormGroup, Validators, FormBuilder } from '@angular/forms'; import { Component, OnInit } from '@angular/core'; diff --git a/frontend/src/app/utils/Focus.directive.ts b/frontend/src/app/utils/focus.directive.ts similarity index 100% rename from frontend/src/app/utils/Focus.directive.ts rename to frontend/src/app/utils/focus.directive.ts diff --git a/frontend/src/app/utils/PasswordValidation.util.ts b/frontend/src/app/utils/password-validation.util.ts similarity index 100% rename from frontend/src/app/utils/PasswordValidation.util.ts rename to frontend/src/app/utils/password-validation.util.ts diff --git a/frontend/src/app/utils/stop-propagate-click.directive.ts b/frontend/src/app/utils/stop-propagate-click.directive.ts new file mode 100644 index 0000000..7eb0cff --- /dev/null +++ b/frontend/src/app/utils/stop-propagate-click.directive.ts @@ -0,0 +1,11 @@ +import { Directive, HostListener } from '@angular/core'; + +@Directive({ + selector: '[appStopPropagateClick]' +}) +export class StopPropagateClickDirective { + @HostListener('click', ['$event']) + public onClick(event: any): void { + event.stopPropagation(); + } +}