From b4070122dea9c198fb8ee1f7120a82a636b1830a Mon Sep 17 00:00:00 2001 From: Dmitriy Shekhovtsov Date: Thu, 13 Oct 2016 15:56:13 +0300 Subject: [PATCH] fix(tooltip): properties types --- components/tooltip/tooltip.directive.ts | 6 ++---- demo/custom-typings.d.ts | 3 +++ package.json | 9 ++++----- tsconfig.json | 3 +-- 4 files changed, 10 insertions(+), 11 deletions(-) diff --git a/components/tooltip/tooltip.directive.ts b/components/tooltip/tooltip.directive.ts index 0701d4e3e2..8aaca3867f 100644 --- a/components/tooltip/tooltip.directive.ts +++ b/components/tooltip/tooltip.directive.ts @@ -42,7 +42,7 @@ export class TooltipDirective { private visible: boolean = false; private tooltip: ComponentRef; - private delayTimeoutId: NodeJS.Timer; + private delayTimeoutId: number; public constructor(viewContainerRef: ViewContainerRef, componentsHelper: ComponentsHelper) { @@ -84,9 +84,7 @@ export class TooltipDirective { }; if (this.delay) { - this.delayTimeoutId = setTimeout(() => { - showTooltip(); - }, this.delay); + this.delayTimeoutId = setTimeout(() => { showTooltip(); }, this.delay); } else { showTooltip(); } diff --git a/demo/custom-typings.d.ts b/demo/custom-typings.d.ts index b986caef98..6791fb2959 100644 --- a/demo/custom-typings.d.ts +++ b/demo/custom-typings.d.ts @@ -1,3 +1,6 @@ declare const ENV:string; // google code-prettify declare const PR:any; + +declare const require:any; +declare const global:any; diff --git a/package.json b/package.json index c5093fe383..30efc46970 100644 --- a/package.json +++ b/package.json @@ -53,10 +53,10 @@ "moment": "2.15.1" }, "peerDependencies": { - "@angular/common": "~2.0.1", - "@angular/compiler": "~2.0.1", - "@angular/core": "~2.0.1", - "@angular/forms": "~2.0.1" + "@angular/common": "^2.0.0", + "@angular/compiler": "^2.0.0", + "@angular/core": "^2.0.0", + "@angular/forms": "^2.0.0" }, "devDependencies": { "@angular/common": "2.0.1", @@ -69,7 +69,6 @@ "@angular/platform-server": "2.0.1", "@angular/router": "3.0.1", "@types/jasmine": "2.2.34", - "@types/node": "6.0.41", "@types/webpack": "1.12.34", "async": "2.0.1", "bootstrap": "3.3.7", diff --git a/tsconfig.json b/tsconfig.json index bbc619300e..8784c69124 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -14,7 +14,6 @@ "lib": ["dom", "es6"], "types": [ "jasmine", - "node", "webpack" ] }, @@ -26,4 +25,4 @@ "./ng2-bootstrap.ts" ], "atom": { "rewriteTsconfig": false } -} \ No newline at end of file +}