Skip to content

Commit c419662

Browse files
committed
Merge pull request #73 from joelburget/master
Clear timeout when unmounting.
2 parents ca9bd32 + 1ff68f4 commit c419662

File tree

3 files changed

+7
-5
lines changed

3 files changed

+7
-5
lines changed

dist/react-tooltip.js

+3-2
Original file line numberDiff line numberDiff line change
@@ -155,6 +155,7 @@ var ReactTooltip = (function (_Component) {
155155
window.removeEventListener('__react_tooltip_hide_event', this.globalHide);
156156
window.removeEventListener('__react_tooltip_rebuild_event', this.globalRebuild);
157157
window.removeEventListener('resize', this.onWindowResize);
158+
window.clearTimeout(this.delayShowLoop);
158159
};
159160

160161
/* TODO: optimize, bind has been trigger too maany times */
@@ -338,7 +339,7 @@ var ReactTooltip = (function (_Component) {
338339
var delayShow = _state.delayShow;
339340
var show = _state.show;
340341

341-
clearTimeout(this.delayShowLoop);
342+
window.clearTimeout(this.delayShowLoop);
342343

343344
var delayTime = show ? 0 : parseInt(delayShow, 10);
344345
var eventTarget = e.currentTarget;
@@ -375,7 +376,7 @@ var ReactTooltip = (function (_Component) {
375376

376377
var delayHide = this.state.delayHide;
377378

378-
clearTimeout(this.delayShowLoop);
379+
window.clearTimeout(this.delayShowLoop);
379380
setTimeout(function () {
380381
_this3.setState({
381382
show: false

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
},
4646
"dependencies": {
4747
"classnames": "^1.2.0",
48-
"react-dom": "^0.14.0"
48+
"react-dom": "0.14.*"
4949
},
5050
"devDependencies": {
5151
"babel": "^5.3.1",

src/index.js

+3-2
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,7 @@ export default class ReactTooltip extends Component {
114114
window.removeEventListener('__react_tooltip_hide_event', this.globalHide)
115115
window.removeEventListener('__react_tooltip_rebuild_event', this.globalRebuild)
116116
window.removeEventListener('resize', this.onWindowResize)
117+
window.clearTimeout(this.delayShowLoop)
117118
}
118119

119120
/* TODO: optimize, bind has been trigger too maany times */
@@ -278,7 +279,7 @@ export default class ReactTooltip extends Component {
278279
*/
279280
updateTooltip (e) {
280281
const {delayShow, show} = this.state
281-
clearTimeout(this.delayShowLoop)
282+
window.clearTimeout(this.delayShowLoop)
282283

283284
const delayTime = show ? 0 : parseInt(delayShow, 10)
284285
const eventTarget = e.currentTarget
@@ -307,7 +308,7 @@ export default class ReactTooltip extends Component {
307308
*/
308309
hideTooltip () {
309310
const {delayHide} = this.state
310-
clearTimeout(this.delayShowLoop)
311+
window.clearTimeout(this.delayShowLoop)
311312
setTimeout(() => {
312313
this.setState({
313314
show: false

0 commit comments

Comments
 (0)