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

docs/network/configure.html

@@ -9,7 +9,7 @@
     <meta name="description" content="">
     <meta name="author" content="">
     <link rel="icon" HREF="favicon.ico">
-    <title>vis.js - A dynamic, browser based visualization library.</title>
+    <title>vis.js - Configure documentation.</title>
 
     <!-- Bootstrap core CSS -->
     <link href="../css/bootstrap.css" rel="stylesheet">
@@ -81,7 +81,7 @@
     <h1>Network - configure</h1>
 
     <p>Handles the HTML part of the canvas.</p>
-
+    <a class="btn btn-primary" role="button" onclick="history.back()">Back to overview.</a>
     <h3>Options</h3>
     <p>The options for the canvas have to be contained in an object titled 'configure'.</p>
     <p>Click on the full options or shorthand options to show how these options are supposed to be used.</p>

docs/network/edges.html

@@ -7,7 +7,7 @@
     <meta name="description" content="">
     <meta name="author" content="">
     <link rel="icon" HREF="favicon.ico">
-    <title>vis.js - A dynamic, browser based visualization library.</title>
+    <title>vis.js - Edges documentation.</title>
 
     <!-- Bootstrap core CSS -->
     <link href="../css/bootstrap.css" rel="stylesheet">
@@ -81,7 +81,7 @@
     <h1>Network - edges</h1>
 
     <p>Handles the creation and deletion of edges and contains the global edge options and styles.</p>
-
+    <a class="btn btn-primary" role="button" onclick="history.back()">Back to overview.</a>
     <h3>Options</h3>
 
     <p>The options for the edges have to be contained in an object titled 'edges'. All of these options can be supplied per edge as well. Obviously, 'id' should not be defined globally but per edge. Options defined

docs/network/groups.html

@@ -7,7 +7,7 @@
     <meta name="description" content="">
     <meta name="author" content="">
     <link rel="icon" HREF="favicon.ico">
-    <title>vis.js - A dynamic, browser based visualization library.</title>
+    <title>vis.js - Groups documentation.</title>
 
     <!-- Bootstrap core CSS -->
     <link href="../css/bootstrap.css" rel="stylesheet">
@@ -79,7 +79,7 @@
     <h1>Network - groups</h1>
 
     <p>Handles the group styling.</p>
-
+    <a class="btn btn-primary" role="button" onclick="history.back()">Back to overview.</a>
     <h3>Options</h3>
 
     <p>The options for the canvas have to be contained in an object titled 'groups'.</p>

docs/network/index.html

@@ -7,7 +7,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <meta name="description" content="">
     <meta name="author" content="">
-    <title>vis.js - A dynamic, browser based visualization library.</title>
+    <title>vis.js - Network documentation.</title>
 
     <!-- Bootstrap core CSS -->
     <link href="../css/bootstrap.css" rel="stylesheet">
@@ -645,6 +645,7 @@ function releaseFunction (clusterPosition, containedNodesPositions) {
     newPositions[nodeId] = {x:newPosX, y:newPosY};
     return newPositions;
 }</pre>
+                    The containedNodesPositions contain the positions of the nodes in the cluster at the moment they were clustered.
                     This function is expected to return the newPositions, which can be the containedNodesPositions (altered) or a new object. This has to be an object with keys equal
                     to the nodeIds that exist in the containedNodesPositions and an <code>{x:x,y:y}</code> position object. <br><br>
 

docs/network/interaction.html

@@ -7,7 +7,7 @@
     <meta name="description" content="">
     <meta name="author" content="">
     <link rel="icon" HREF="favicon.ico">
-    <title>vis.js - A dynamic, browser based visualization library.</title>
+    <title>vis.js - Interaction documentation.</title>
 
     <!-- Bootstrap core CSS -->
     <link href="../css/bootstrap.css" rel="stylesheet">
@@ -67,7 +67,7 @@
 <div class="container full">
     <h1>Network - interaction</h1>
     <p>Used for all user interaction with the network. Handles mouse and touch events as well as the navigation buttons and the popups.</p>
-
+    <a class="btn btn-primary" role="button" onclick="history.back()">Back to overview.</a>
     <h3>Options</h3>
     <p>The options for the interaction module have to be contained in an object titled 'interaction'.</p>
     <p>Click on the full options or shorthand options to show how these options are supposed to be used.</p>

docs/network/layout.html

@@ -6,7 +6,7 @@
     <meta name="description" content="">
     <meta name="author" content="">
     <link rel="icon" HREF="favicon.ico">
-    <title>vis.js - A dynamic, browser based visualization library.</title>
+    <title>vis.js - Layout documentation.</title>
 
     <!-- Bootstrap core CSS -->
     <link href="../css/bootstrap.css" rel="stylesheet">
@@ -68,7 +68,7 @@
 <div class="container full">
     <h1>Network - layout</h1>
     <p>Acts as the camera that looks on the canvas. Does the animation, zooming and focusing.</p>
-
+    <a class="btn btn-primary" role="button" onclick="history.back()">Back to overview.</a>
     <h3>Options</h3>
     <p>The options for the layout module have to be contained in an object titled 'layout'.</p>
     <p>Click on the full options or shorthand options to show how these options are supposed to be used.</p>

docs/network/manipulation.html

@@ -6,7 +6,7 @@
     <meta name="description" content="">
     <meta name="author" content="">
     <link rel="icon" HREF="favicon.ico">
-    <title>vis.js - A dynamic, browser based visualization library.</title>
+    <title>vis.js - Manipulation documentation.</title>
 
     <!-- Bootstrap core CSS -->
     <link href="../css/bootstrap.css" rel="stylesheet">
@@ -67,7 +67,7 @@
 <div class="container full">
     <h1>Network - manipulation</h1>
     <p>Acts as the camera that looks on the canvas. Does the animation, zooming and focusing.</p>
-
+    <a class="btn btn-primary" role="button" onclick="history.back()">Back to overview.</a>
     <h3>Options</h3>
     <p>The options for the manipulation module have to be contained in an object titled 'manipulation'.</p>
     <p>Click on the full options or shorthand options to show how these options are supposed to be used.</p>

docs/network/nodes.html

@@ -7,7 +7,7 @@
     <meta name="description" content="">
     <meta name="author" content="">
     <link rel="icon" HREF="favicon.ico">
-    <title>vis.js - A dynamic, browser based visualization library.</title>
+    <title>vis.js - Nodes documentation.</title>
 
     <!-- Bootstrap core CSS -->
     <link href="../css/bootstrap.css" rel="stylesheet">
@@ -73,7 +73,7 @@
     <h1>Network - nodes</h1>
 
     <p>Handles the creation and deletion of nodes and contains the global node options and styles.</p>
-
+    <a class="btn btn-primary" role="button" onclick="history.back()">Back to overview.</a>
     <h3>Options</h3>
     <p>The options for the nodes have to be contained in an object titled 'nodes'. All of these options can be supplied per node as well. Obviously, 'id' should not be defined globally but per node. Options defined
         in the global nodes object, are applied to all nodes. If a node has options of its own, those will be used instead of the global options.</p>

docs/network/physics.html

@@ -6,7 +6,7 @@
     <meta name="description" content="">
     <meta name="author" content="">
     <link rel="icon" HREF="favicon.ico">
-    <title>vis.js - A dynamic, browser based visualization library.</title>
+    <title>vis.js - Physics documentation.</title>
 
     <!-- Bootstrap core CSS -->
     <link href="../css/bootstrap.css" rel="stylesheet">
@@ -68,7 +68,7 @@
 <div class="container full">
     <h1>Network - physics</h1>
     <p>Handles the physics simulation, moving the nodes and edges to show them clearly.</p>
-
+    <a class="btn btn-primary" role="button" onclick="history.back()">Back to overview.</a>
     <h3>Options</h3>
     <p>The options for the physics have to be contained in an object titled 'physics'.</p>
     <p>Click on the full options or shorthand options to show how these options are supposed to be used.</p>