Merge branch 'dev'

cheton · Apr 16, 2016 · e8c5ba0 · e8c5ba0
2 parents 2f72820 + f1e2cc6
commit e8c5ba0
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 1 deletion.
diff --git a/dist/infinite-tree.js b/dist/infinite-tree.js
@@ -758,6 +758,11 @@ return /******/ (function(modules) { // webpackBootstrap
 	                return false;
 	            }
 
+	            // Reentrancy not allowed
+	            if (node.state.loading === true) {
+	                return false;
+	            }
+
 	            // Set loading state to true
 	            node.state.loading = true;
 	            this.rows[nodeIndex] = this.options.rowRenderer(node, this.options);