Merge branch 'dev'

cheton · Apr 12, 2016 · ad570de · ad570de
2 parents a99eff8 + 6f577a2
commit ad570de
Show file tree

Hide file tree

Showing 8 changed files with 23 additions and 13 deletions.
diff --git a/README.md b/README.md
@@ -23,6 +23,9 @@ Demo: http://cheton.github.io/infinite-tree
  Yes | Yes | Yes| 8+ | Yes | Yes | 
 Need to include [es5-shim](https://github.com/es-shims/es5-shim#example-of-applying-es-compatability-shims-in-a-browser-project) polyfill for IE8
 
+## React Support
+Check out <b>react-infinite-tree</b> at https://github.com/cheton/react-infinite-tree.
+
 ## Notice
 <i>The project is under heavy development and a lot of things are changing. Stay tuned for further updates.</i>
 

diff --git a/dist/infinite-tree.js b/dist/infinite-tree.js
@@ -1,4 +1,4 @@
-/*! infinite-tree v0.8.1 | (c) 2016 Cheton Wu <[email protected]> | MIT | https://github.com/cheton/infinite-tree */
+/*! infinite-tree v0.8.2 | (c) 2016 Cheton Wu <[email protected]> | MIT | https://github.com/cheton/infinite-tree */
 (function webpackUniversalModuleDefinition(root, factory) {
 	if(typeof exports === 'object' && typeof module === 'object')
 		module.exports = factory();
@@ -731,8 +731,11 @@ return /******/ (function(modules) { // webpackBootstrap
 	                    _this5.appendChildNode(childNode, node);
 	                });
 
-	                // Call openNode again
-	                _this5.openNode(node);
+	                // Ensure the node has children to prevent from infinite loop
+	                if (node.hasChildren()) {
+	                    // Call openNode again
+	                    _this5.openNode(node);
+	                }
 	            });
 
 	            return false;

diff --git a/dist/infinite-tree.min.js b/dist/infinite-tree.min.js
diff --git a/examples/bundle.js b/examples/bundle.js
diff --git a/examples/bundle.js.map b/examples/bundle.js.map
diff --git a/examples/index.html b/examples/index.html
@@ -2,8 +2,10 @@
 <html>
 <head>
 <meta charset="utf-8">
-<meta http-equiv="X-UA-Compatible" content="chrome=1">
+<meta http-equiv="x-ua-compatible" content="ie=edge">
 <title>infinite-tree</title>
+<meta name="description" content="">
+<meta name="viewport" content="width=device-width, initial-scale=1">
 <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/css/bootstrap.min.css">
 <style>
 html, body {
@@ -78,7 +80,6 @@
     line-height: 42px;
 }
 </style>
-<meta name="viewport" content="width=device-width">
 <!--[if lt IE 9]>
 <script src="//html5shiv.googlecode.com/svn/trunk/html5.js"></script>
 <script src="//cdnjs.cloudflare.com/ajax/libs/es5-shim/4.5.7/es5-shim.min.js"></script>

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "infinite-tree",
-  "version": "0.8.1",
+  "version": "0.8.2",
   "description": "A browser-ready tree library that can efficiently display a large tree with smooth scrolling.",
   "homepage": "https://github.com/cheton/infinite-tree",
   "main": "lib/index.js",

diff --git a/src/infinite-tree.js b/src/infinite-tree.js
@@ -590,8 +590,11 @@ class InfiniteTree extends events.EventEmitter {
                     this.appendChildNode(childNode, node);
                 });
 
-                // Call openNode again
-                this.openNode(node);
+                // Ensure the node has children to prevent from infinite loop
+                if (node.hasChildren()) {
+                    // Call openNode again
+                    this.openNode(node);
+                }
             });
 
             return false;