[fixed] extra timeout check, prevent setState after unmount

YeJIoOb · Jan 12, 2016 · 438e30a · 438e30a
1 parent 4b6abc7
commit 438e30a
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/package.json b/package.json
@@ -106,6 +106,7 @@
     "less": "^2.5.1",
     "less-loader": "^2.2.0",
     "marked": "^0.3.5",
+    "mocha": "^2.3.4",
     "moment": "^2.10.6",
     "mt-changelog": "^0.6.2",
     "node-libs-browser": "^0.5.2",

diff --git a/src/mixins/TimeoutMixin.js b/src/mixins/TimeoutMixin.js
@@ -16,11 +16,12 @@ module.exports = {
   setTimeout(key, cb, duration){
     var timers = this._timers || (this._timers = Object.create(null));
 
-    if ( this._unmounted)
+    if (this._unmounted)
       return
 
     clearTimeout(timers[key])
-    timers[key] = window.setTimeout(cb, duration)
+    timers[key] = window.setTimeout(() => {
+      if (!this._unmounted) cb()
+    }, duration)
   }
-
 }
diff --git a/test/.eslintrc b/test/.eslintrc
@@ -6,7 +6,6 @@
     "$": true,
     "sinon": true,
     "expect": true,
-    "sinon": true,
     "__REACT_VERSION__": true
   },
   "plugins": [