Merge remote-tracking branch 'origin/develop' into develop

HISTORY.md

@@ -1,6 +1,15 @@
 vis.js history
 http://visjs.org
 
+## 2014-03-04, version 0.6.0
+
+### Graph
+
+- Added Physics Configuration option. This makes tweaking the physics system to suit your needs easier.
+- Click and doubleClick events.
+- Initial zoom bugfix.
+- Directions for Hierarchical layout.
+- Refactoring and bugfixes.
 
 ## 2014-02-20, version 0.5.1
 

examples/graph/25_physics_configuration.html

@@ -27,7 +27,7 @@
       var connectionCount = [];
 
       // randomly create some nodes and edges
-      var nodeCount = document.getElementById('nodeCount').value;
+      var nodeCount = 60;
       for (var i = 0; i < nodeCount; i++) {
         nodes.push({
           id: i,
@@ -103,14 +103,6 @@
     On start, the default settings will be loaded. Keep in mind that selecting the hierarchical simulation mode <b>disables</b> smooth curves. These will not be enabled again afterwards.
 </div>
 <br />
-<form onsubmit="draw(); return false;">
-  <label for="nodeCount">Number of nodes:</label>
-  <input id="nodeCount" type="text" value="25" style="width: 50px;">
-  <input type="submit" value="Go">
-</form>
-
-<br>
-
 <div id="mygraph"></div>
 
 <p id="selection"></p>

examples/graph/index.html

@@ -36,6 +36,7 @@
   <p><a href="22_les_miserables.html">22_les_miserables.html</a></p>
   <p><a href="23_hierarchical_layout.html">23_hierarchical_layout.html</a></p>
   <p><a href="24_hierarchical_layout_userdefined.html">24_hierarchical_layout_userdefined.html</a></p>
+  <p><a href="25_physics_configuration.html">25_physics_configuration.html</a></p>
   <p><a href="graphviz/graphviz_gallery.html">graphviz_gallery.html</a></p>
 
 </div>

index.html

@@ -311,6 +311,12 @@ The source code of the examples can be found in the
             <div>user-defined hierarchy</div>
         </a>
     </div>
+    <div class="thumb">
+        <a href="examples/graph/25_physics_configuration.html">
+            <img src="img/gallery/graph/25_physics_configuration.png">
+            <div>physics configuration</div>
+        </a>
+    </div>
   <div class="thumb">
     <a href="examples/graph/graphviz/graphviz_gallery.html">
       <img src="img/gallery/graph/graphviz_gallery.png">