Possible fix for #1398

google · May 24, 2016 · 5065fe8 · 5065fe8
1 parent 2ba2dd9
commit 5065fe8
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/src/tooltip/tooltip.js b/src/tooltip/tooltip.js
@@ -106,11 +106,11 @@
   };
 
   /**
-   * Handle mouseleave for tooltip.
+   * Hide tooltip on mouseleave or scroll
    *
    * @private
    */
-  MaterialTooltip.prototype.handleMouseLeave_ = function() {
+  MaterialTooltip.prototype.hideTooltip_ = function() {
     this.element_.classList.remove(this.CssClasses_.IS_ACTIVE);
   };
 
@@ -133,11 +133,12 @@
         }
 
         this.boundMouseEnterHandler = this.handleMouseEnter_.bind(this);
-        this.boundMouseLeaveHandler = this.handleMouseLeave_.bind(this);
+        this.boundMouseLeaveAndScrollHandler = this.hideTooltip_.bind(this);
         this.forElement_.addEventListener('mouseenter', this.boundMouseEnterHandler, false);
         this.forElement_.addEventListener('touchend', this.boundMouseEnterHandler, false);
-        this.forElement_.addEventListener('mouseleave', this.boundMouseLeaveHandler, false);
-        window.addEventListener('touchstart', this.boundMouseLeaveHandler);
+        this.forElement_.addEventListener('mouseleave', this.boundMouseLeaveAndScrollHandler, false);
+        window.addEventListener('scroll', this.boundMouseLeaveAndScrollHandler, true);
+        window.addEventListener('touchstart', this.boundMouseLeaveAndScrollHandler);
       }
     }
   };