Fix timer callback triggering after timer is cleared (elastic#865)

* ensure that a timer has not already been cleared when calling the callback * changelog
chandlerprall · May 24, 2018 · 4cd0b09 · 4cd0b09
1 parent 90d0904
commit 4cd0b09
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,7 @@
 **Bug fixes**
 
 - `EuiButton`, `EuiButtonEmpty`, and `EuiButtonIcon` now look and behave disabled when `isDisabled={true}` ([#862](https://github.com/elastic/eui/pull/862))
+- `EuiGlobalToastList` no longer triggers `Uncaught TypeError: _this.callback is not a function`  ([#865](https://github.com/elastic/eui/pull/865))
 
 ## [`0.0.49`](https://github.com/elastic/eui/tree/v0.0.49)
 

diff --git a/src/services/time/timer.js b/src/services/time/timer.js
@@ -14,6 +14,7 @@ export class Timer {
 
   resume = () => {
     this.id = setTimeout(this.finish, this.timeRemaining);
+    this.finishTime = Date.now() + this.timeRemaining;
     this.timeRemaining = undefined;
   };
 
@@ -26,7 +27,9 @@ export class Timer {
   };
 
   finish = () => {
-    this.callback();
+    if (this.callback) {
+      this.callback();
+    }
     this.clear();
   };
 }