fix(tooltip): fix tooltip with delay only appearing once (#2826)

* fix(tooltip): fix tooltip with delay only appearing once * Update .travis.yml * Update .travis.yml * Update .travis.yml * Update .travis.yml
valor-software · Oct 18, 2017 · e625faa · e625faa
1 parent ee7081d
commit e625faa
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,6 +1,6 @@
 sudo: false
 language: node_js
-node_js: "6"
+node_js: "8"
 
 notifications:
   email: false
@@ -42,7 +42,7 @@ install:
   - if [[ "$NGV" == "latest" ]]; then  ./scripts/ci/npm-ng-latest.sh; fi
   - if [[ "$NGV" == "next" ]]; then  ./scripts/ci/npm-ng-next.sh; fi
   - npm i ./dist  > /dev/null
-  - if [[ "$TRAVIS_PULL_REQUEST" != false ]]; then SAUCE_USERNAME=$SAUCE_USERNAME_PR; SAUCE_ACCESS_KEY=$SAUCE_ACCESS_KEY_PR; fi
+  - if [[ "$TRAVIS_PULL_REQUEST" != false ]]; then export SAUCE_USERNAME=$SAUCE_USERNAME_PR; export SAUCE_ACCESS_KEY=$SAUCE_ACCESS_KEY_PR; fi
 
 jobs:
   fast_finish: true

diff --git a/src/tooltip/tooltip.directive.ts b/src/tooltip/tooltip.directive.ts
@@ -224,7 +224,11 @@ export class TooltipDirective implements OnInit, OnDestroy {
       return;
     }
 
-    const showTooltip = () =>
+    const showTooltip = () => {
+      if (this._delayTimeoutId) {
+        this._delayTimeoutId = undefined;
+      }
+
       this._tooltip
         .attach(TooltipContainerComponent)
         .to(this.container)
@@ -234,6 +238,7 @@ export class TooltipDirective implements OnInit, OnDestroy {
           placement: this.placement,
           containerClass: this.containerClass
         });
+    }
 
     if (this._delay) {
       this._delayTimeoutId = setTimeout(() => {