Merge branch 'master' into grid-support

clauderic · Nov 26, 2016 · 7e251ec · 7e251ec · ralf-strehle · Dec 14, 2016
2 parents c3ae90f + 7339c78
commit 7e251ec
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/package.json b/package.json
@@ -90,6 +90,7 @@
     "qs": "^6.2.0",
     "raw-loader": "^0.5.1",
     "react": "^15.2.1",
+    "react-dom": "^15.2.1",
     "react-addons-pure-render-mixin": "^15.0.2",
     "react-addons-shallow-compare": "^15.1.0",
     "react-addons-test-utils": "^15.1.0",

diff --git a/src/SortableContainer/index.js b/src/SortableContainer/index.js
@@ -585,7 +585,7 @@ export default function SortableContainer(WrappedComponent, config = {withRef: f
 			}
 
 			if (this.autoscrollInterval) {
-				clearTimeout(this.autoscrollInterval);
+				clearInterval(this.autoscrollInterval);
 				this.autoscrollInterval = null;
 				this.isAutoScrolling = false;
 			}