From 3298774cdb966b7b1bc78c71cb11bd9d03bb539f Mon Sep 17 00:00:00 2001 From: crusader Date: Tue, 29 May 2018 14:24:36 +0900 Subject: [PATCH] ing --- .../component/member-signup.component.ts | 5 ++-- .../layout/menu/app.submenu.component.ts | 3 ++- tsconfig.json | 26 ++++++++++++------- 3 files changed, 22 insertions(+), 12 deletions(-) diff --git a/@overflow/member/component/member-signup.component.ts b/@overflow/member/component/member-signup.component.ts index 3dd634e..e13dce0 100644 --- a/@overflow/member/component/member-signup.component.ts +++ b/@overflow/member/component/member-signup.component.ts @@ -5,7 +5,7 @@ import { Output, EventEmitter, } from '@angular/core'; -import { FormGroup, FormBuilder, Validators, AbstractControl, FormControl } from '@angular/forms'; +import { FormGroup, FormBuilder, Validators, AbstractControl, FormControl, ValidationErrors } from '@angular/forms'; import { Member } from '@overflow/commons-typescript/model/member'; @Component({ @@ -92,7 +92,7 @@ export class MemberSignupComponent implements OnInit, OnDestroy { this.company = this.signupForm.controls['company']; } - pwMatchValidator(control: FormControl): { [s: string]: boolean } { + pwMatchValidator(control: FormControl): ValidationErrors { let pw; if (control.parent) { pw = control.parent.controls['password'].value; @@ -100,6 +100,7 @@ export class MemberSignupComponent implements OnInit, OnDestroy { if (control.value !== pw) { return { notMatched: true }; } + return null; } signupFormSubmit() { diff --git a/src/app/commons/component/layout/menu/app.submenu.component.ts b/src/app/commons/component/layout/menu/app.submenu.component.ts index ae451f2..8b0321c 100644 --- a/src/app/commons/component/layout/menu/app.submenu.component.ts +++ b/src/app/commons/component/layout/menu/app.submenu.component.ts @@ -44,7 +44,7 @@ export class AppSubMenuComponent { constructor(public app: PagesComponent) { } - itemClick(event: Event, item: MenuItem, index: number)  { + itemClick(event: Event, item: MenuItem, index: number): boolean  { if (this.root) { this.app.menuHoverActive = !this.app.menuHoverActive; } @@ -83,6 +83,7 @@ export class AppSubMenuComponent { this.app.staticMenuMobileActive = false; this.app.menuHoverActive = !this.app.menuHoverActive; } + return false; } onMouseEnter(index: number) { diff --git a/tsconfig.json b/tsconfig.json index 6935ae0..af2a405 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -24,17 +24,25 @@ "@app/*": [ "src/app/*" ] - } - // /* Additional Checks */ + }, + /* Strict Type-Checking Options */ + // "noImplicitAny": true /* Raise error on expressions and declarations with an implied 'any' type. */, + // "strictNullChecks": true /* Enable strict null checks. */, + // "strictFunctionTypes": true /* Enable strict checking of function types. */, + "strictPropertyInitialization": true /* Enable strict checking of property initialization in classes. */, + // "noImplicitThis": true /* Raise error on 'this' expressions with an implied 'any' type. */, + // "alwaysStrict": true /* Parse in strict mode and emit "use strict" for each source file. */, + + /* Additional Checks */ // "noUnusedLocals": true /* Report errors on unused locals. */, // "noUnusedParameters": true /* Report errors on unused parameters. */, - // "noImplicitReturns": true /* Report error when not all code paths in function return a value. */, - // "noFallthroughCasesInSwitch": true /* Report errors for fallthrough cases in switch statement. */, + "noImplicitReturns": true /* Report error when not all code paths in function return a value. */, + "noFallthroughCasesInSwitch": true /* Report errors for fallthrough cases in switch statement. */, - // /* Debugging Options */ - // "traceResolution": false /* Report module resolution log messages. */, - // "listEmittedFiles": false /* Print names of generated files part of the compilation. */, - // "listFiles": false /* Print names of files part of the compilation. */, - // "pretty": true /* Stylize errors and messages using color and context. */, + /* Debugging Options */ + "traceResolution": false /* Report module resolution log messages. */, + "listEmittedFiles": false /* Print names of generated files part of the compilation. */, + "listFiles": false /* Print names of files part of the compilation. */, + "pretty": true /* Stylize errors and messages using color and context. */, } }