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

Conflicts: dist/vis.js
10 years ago · 81ac56c0e2
--- a/.gitignore
+++ b/.gitignore
@ -5,3 +5,4 @@ node_modules
 .settings/org.eclipse.wst.jsdt.ui.superType.container
 .settings/org.eclipse.wst.jsdt.ui.superType.name
 npm-debug.log
 dist/
--- a/Jakefile.js
+++ b/Jakefile.js
@ -82,11 +82,15 @@ task('build', {async: true}, function () {
      './src/graph/Popup.js',
      './src/graph/Groups.js',
      './src/graph/Images.js',
      './src/graph/manipulationMixin.js',
      './src/graph/SectorsMixin.js',
      './src/graph/ClusterMixin.js',
      './src/graph/SelectionMixin.js',
      './src/graph/NavigationMixin.js',
      './src/graph/graphMixins/physics/PhysicsMixin.js',
      './src/graph/graphMixins/physics/BarnesHut.js',
      './src/graph/graphMixins/physics/Repulsion.js',
      './src/graph/graphMixins/ManipulationMixin.js',
      './src/graph/graphMixins/SectorsMixin.js',
      './src/graph/graphMixins/ClusterMixin.js',
      './src/graph/graphMixins/SelectionMixin.js',
      './src/graph/graphMixins/NavigationMixin.js',
      './src/graph/graphMixins/MixinLoader.js',
      './src/graph/Graph.js',

      './src/module/exports.js'
@ -99,6 +103,10 @@ task('build', {async: true}, function () {
  wrench.copyDirSyncRecursive('./src/graph/img', DIST+ '/img', {
    forceDelete: true
  });
  // copy css
  wrench.copyDirSyncRecursive('./src/graph/css', DIST+ '/css', {
    forceDelete: true
  });

  var timeStart = Date.now();
  // bundle the concatenated script and dependencies into one file
--- a/dist/vis.js
+++ b/dist/vis.js
--- a/dist/vis.min.js
+++ b/dist/vis.min.js
--- a/docs/graph.html
+++ b/docs/graph.html
@ -53,7 +53,9 @@
      <li><a href="#Nodes_configuration">Nodes</a></li>
      <li><a href="#Edges_configuration">Edges</a></li>
      <li><a href="#Groups_configuration">Groups</a></li>
      <li><a href="#Clustering">Clustering</a></li>
        <li><a href="#Physics">Physics</a></li>
        <li><a href="#Data_manipulation">Data_manipulation</a></li>
        <li><a href="#Clustering">Clustering</a></li>
      <li><a href="#Navigation_controls">Navigation controls</a></li>
      <li><a href="#Keyboard_navigation">Keyboard navigation</a></li>
    </ul>
@ -529,13 +531,6 @@ var edges = [
      type.</td>
  </tr>

  <tr>
    <td>length</td>
    <td>number</td>
    <td>no</td>
    <td>The length of the edge in pixels.</td>
  </tr>

  <tr>
    <td>style</td>
    <td>string</td>
@ -647,6 +642,25 @@ var options = {
    <th>Description</th>
  </tr>

    <tr>
        <td><a href="#Physics">physics</a></td>
        <td>Object</td>
        <td>none</td>
        <td>
            Configuration of the physics system governing the simulation of the nodes and edges.
            Barnes-Hut nBody simulation is used by default. See section <a href="#Physics">Physics</a> for an overview of the available options.
        </td>
    </tr>

    <tr>
        <td><a href="#Data_manipulation">dataManipulation</a></td>
        <td>Object</td>
        <td>none</td>
        <td>
            Settings for manipulating the Dataset. See section <a href="#Data_manipulation">Data manipulation</a> for an overview of the available options.
        </td>
    </tr>

  <tr>
    <td><a href="#Clustering">clustering</a></td>
    <td>Object</td>
@ -710,6 +724,13 @@ var options = {
    </td>
  </tr>

    <tr>
        <td>smoothCurves</td>
        <td>Boolean</td>
        <td>true</td>
        <td>If true, edges are drawn as smooth curves. This is more computationally intensive since the edge now is a quadratic Bezier curve with control points on both nodes and an invisible node in the center of the edge. This support node is also handed by the physics simulation.</td>
    </tr>

  <tr>
    <td>selectable</td>
    <td>Boolean</td>
@ -964,12 +985,6 @@ var options = {
      Only applicable when the line style is <code>dash-line</code>.</td>
  </tr>

  <tr>
    <td>length</td>
    <td>Number</td>
    <td>100</td>
    <td>The default length of a edge.</td>
  </tr>
  <tr>
    <td>style</td>
    <td>String</td>
@ -1122,6 +1137,236 @@ var nodes = [

 </table>

 <h3 id="Physics">Physics</h3>
 <p>
    The physics system has been overhauled to increase performance. The original simulation method was based on particel physics with a repulsion field (potential) around each node,
    and the edges were modelled as springs. The new system employed the <a href="http://en.wikipedia.org/wiki/Barnes%E2%80%93Hut_simulation">Barnes-Hut</a> gravitational simulation model. The edges are still modelled as springs.
    To unify the physics system, the damping, repulsion distance and edge length have been combined in an physics option. To retain good behaviour, both the old repulsion model and the Barnes-Hut model have their own parameters.
    If no options for the physics system are supplied, the Barnes-Hut method will be used with the default parameters.
 </p>
 <pre class="prettyprint">
 // These variables must be defined in an options object named physics.
 // If a variable is not supplied, the default value is used.
 var options = {
    physics: {
        barnesHut: {
            enabled: true,
            gravitationalConstant: -2000,
            centralGravity: 0.1,
            springLength: 100,
            springConstant: 0.05,
            damping: 0.09
        },
        repulsion: {
            centralGravity: 0.1,
            springLength: 50,
            springConstant: 0.05,
            nodeDistance: 100,
            damping: 0.09
        },
    }
 </pre>
 <h5>barnesHut:</h5>
 <table>
    <tr>
        <th>Name</th>
        <th>Type</th>
        <th>Default</th>
        <th>Description</th>
    </tr>
    <tr>
        <td>enabled</td>
        <td>Boolean</td>
        <td>true</td>
        <td>This switches the Barnes-Hut simulation on or off. If it is turned off, the old repulsion model is used. Barnes-Hut is generally faster and yields better results.</td>
    </tr>
    <tr>
        <td>gravitationalConstant</td>
        <td>Number</td>
        <td>-2000</td>
        <td>This is the gravitational constand used to calculate the gravity forces. More information is available <a href="http://en.wikipedia.org/wiki/Newton's_law_of_universal_gravitation" target="_blank">here</a>.</td>
    </tr>
    <tr>
        <td>centralGravity</td>
        <td>Number</td>
        <td>0.1</td>
        <td>The central gravity is a force that pulls all nodes to the center. This ensures independent groups do not float apart.</td>
    </tr>
    <tr>
        <td>springLength</td>
        <td>Number</td>
        <td>100</td>
        <td>In the previous versions this was a property of the edges, called length. This is the length of the springs when they are at rest. During the simulation they will be streched by the gravitational fields.
            To greatly reduce the edge length, the gravitationalConstant has to be reduced as well.</td>
    </tr>
    <tr>
        <td>springConstant</td>
        <td>Number</td>
        <td>0.05</td>
        <td>This is the spring constant used to calculate the spring forces based on Hooke&prime;s Law. More information is available <a href="http://en.wikipedia.org/wiki/Hooke's_law" target="_blank">here</a>.</td>
    </tr>
    <tr>
        <td>damping</td>
        <td>Number</td>
        <td>0.09</td>
        <td>This is the damping constant. It is used to dissipate energy from the system to have it settle in an equilibrium. More information is available <a href="http://en.wikipedia.org/wiki/Damping" target="_blank">here</a>.</td>
    </tr>
 </table>
 <h5>repulsion:</h5>
 <table>
    <tr>
        <th>Name</th>
        <th>Type</th>
        <th>Default</th>
        <th>Description</th>
    </tr>

    <tr>
        <td>centralGravity</td>
        <td>Number</td>
        <td>0.1</td>
        <td>The central gravity is a force that pulls all nodes to the center. This ensures independent groups do not float apart.</td>
    </tr>
    <tr>
        <td>springLength</td>
        <td>Number</td>
        <td>50</td>
        <td>In the previous versions this was a property of the edges, called length. This is the length of the springs when they are at rest. During the simulation they will be streched by the gravitational fields.
            To greatly reduce the edge length, the gravitationalConstant has to be reduced as well.</td>
    </tr>
    <tr>
        <td>nodeDistance</td>
        <td>Number</td>
        <td>100</td>
        <td>This parameter is used to define the distance of influence of the repulsion field of the nodes. Below half this distance, the repulsion is maximal and beyond twice this distance the repulsion is zero.</td>
    </tr>

    <tr>
        <td>springConstant</td>
        <td>Number</td>
        <td>0.05</td>
        <td>This is the spring constant used to calculate the spring forces based on Hooke&prime;s Law. More information is available <a href="http://en.wikipedia.org/wiki/Hooke's_law" target="_blank">here</a>.</td>
    </tr>
    <tr>
        <td>damping</td>
        <td>Number</td>
        <td>0.09</td>
        <td>This is the damping constant. It is used to dissipate energy from the system to have it settle in an equilibrium. More information is available <a href="http://en.wikipedia.org/wiki/Damping" target="_blank">here</a>.</td>
    </tr>
 </table>

 <h3 id="Data_manipulation">Data manipulation</h3>
 <p>
    By using the data manipulation feature of the graph you can dynamically create nodes, connect nodes with edges, edit nodes or delete nodes and edges.
    The toolbar is fully HTML and CSS so the user can style this to their preference. To control the behaviour of the data manipulation, users can insert custom functions
    into the data manipulation process. For example, an injected function can show an detailed pop-up when a user wants to add a node. In <a href="../examples/graph/21_data_manipulation.html">example 21</a>,
    two functions have been injected into the add and edit functionality. This is described in more detail in the next subsection.
 </p>
 <pre class="prettyprint">
 // These variables must be defined in an options object named dataManipulation.
 // If a variable is not supplied, the default value is used.
 var options = {
    dataManipulation: {
      enabled: false,
      initiallyVisible: false
    }
 }
 // OR to just load the module with default values:
 var options: {
    dataManipulation: true
 }
 </pre>
 <table>
 <tr>
    <th>Name</th>
    <th>Type</th>
    <th>Default</th>
    <th>Description</th>
 </tr>

 <tr>
    <td>enabled</td>
    <td>Boolean</td>
    <td>false</td>
    <td>Enabling or disabling of the data manipulation toolbar. If it is initially hidden, an edit button appears in the top left corner.</td>
 </tr>
 <tr>
    <td>initiallyVisible</td>
    <td>Boolean</td>
    <td>false</td>
    <td>Initially hide or show the data manipulation toolbar.</td>
 </tr>
 </table>

 <h4 id="Data_manipulation_custom">Data manipulation: custom functionality</h4>
 <p>
    Users can insert custom functions into the add node, edit node, connect nodes, and delete selected operations. This is done by supplying them in the options.
    If the callback is NOT called, nothing happens. <a href="../examples/graph/21_data_manipulation.html">Example 21</a> has two working examples
    for the add and edit functions. The data the user is supplied with in these functions has been described in the code below.
    For the add data, you can add any and all options that are accepted for node creation as described above. The same goes for edit, however only the fields described
    in the code below contain information on the selected node. The callback for connect accepts any options that are used for edge creation. Only the callback for delete selected
    requires the same data structure that is supplied to the user. <br /><br />
    <b>If there is no injected function supplied for the edit operation, the button will not be shown in the toolbar.</b>
 </p>
 <pre class="prettyprint">
 // If a variable is not supplied, the default value is used.
 var options: {
    dataManipulation: true,
    onAdd: function(data,callback) {
        // fixed must be false because we define a set x and y position.
        // If fixed is not false, the node cannot move.
        /** data = {id: random unique id,
        *           label: new,
        *           x: x position of click (canvas space),
        *           y: y position of click (canvas space),
        *           fixed: false
        *          };
        */
        var newData = {..}; // alter the data as you want.
                            // all fields normally accepted by a node can be used.
        callback(newData);  // call the callback to add a node.
    },
    onEdit: function(data,callback) {
        /** data = {id:...,
        *           label: ...,
        *           group: ...,
        *           shape: ...,
        *           color: {
        *             background:...,
        *             border:...,
        *             highlight: {
        *               background:...,
        *               border:...
        *             }
        *           }
        *          };
        */
        var newData = {..}; // alter the data as you want.
                            // all fields normally accepted by a node can be used.
        callback(newData);  // call the callback with the new data to edit the node.
    }
    onConnect: function(data,callback) {
        // data = {from: nodeId1, to: nodeId2};
        var newData = {..};      // check or alter data as you see fit.
        callback(newData);       // call the callback to connect the nodes.
    },
    onDelete: function(data,callback) {
        // data = {nodes: [selectedNodeIds], edges: [selectedEdgeIds]};
        var newData = {..}; // alter the data as you want.
                            // the same data structure is required.
        callback(newData);  // call the callback to delete the objects.
    }
 };
 </pre>
 <p>
    Because the interface elements are CSS and HTML, the user will have to correct for size changes of the canvas. To facilitate this, a new event has been added called frameResize.
    A function can be bound to this event. This function is supplied with the new widht and height of the canvas. The CSS can then be updated accordingly.
    An code snippet from example 21 is shown below.
 </p>
 <pre class="prettyprint">
 graph.on("frameResize", function(params) {console.log(params.width,params.height)});
 </pre>

 <h3 id="Clustering">Clustering</h3>
 <p>
  The graph now supports dynamic clustering of nodes. This allows a user to view a very large dataset (> 50.000 nodes) without
@ -1150,16 +1395,19 @@ var options = {
      reduceToNodes:300,
      chainThreshold: 0.4,
      clusterEdgeThreshold: 20,
      sectorThreshold: 50,
      sectorThreshold: 100,
      screenSizeThreshold: 0.2,
      fontSizeMultiplier:  4.0,
      forceAmplification:  0.6,
      distanceAmplification: 0.2,
      edgeGrowth: 11,
      nodeScaling: {width:  10,
                    height: 10,
                    radius: 10},
      activeAreaBoxSize: 100
      maxFontSize: 1000,
      forceAmplification:  0.1,
      distanceAmplification: 0.1,
      edgeGrowth: 20,
      nodeScaling: {width:  1,
                    height: 1,
                    radius: 1},
      maxNodeSizeIncrements: 600,
      activeAreaBoxSize: 100,
      clusterLevelDifference: 2
    }
 }
 // OR to just load the module with default values:
@ -1233,6 +1481,12 @@ var options: {
    <td>4.0</td>
    <td>This parameter denotes the increase in fontSize of the cluster when a single node is added to it.</td>
  </tr>
    <tr>
        <td>maxFontSize</td>
        <td>Number</td>
        <td>1000</td>
        <td>This parameter denotes the largest allowed font size. If the font becomes too large, some browsers experience problems displaying this.</td>
    </tr>
  <tr>
    <td>forceAmplification</td>
    <td>Number</td>
@ -1251,7 +1505,7 @@ var options: {
  <tr>
    <td>edgeGrowth</td>
    <td>Number</td>
    <td>11</td>
    <td>20</td>
    <td>This factor determines the elongation of edges connected to a cluster.</td>
  </tr>
  <tr>
@ -1272,13 +1526,29 @@ var options: {
    <td>10</td>
    <td>This factor determines how much the radius of a cluster increases in pixels per added node.</td>
  </tr>
  <tr>
    <td>activeAreaBoxSize</td>
    <tr>
        <td>maxNodeSizeIncrements</td>
        <td>Number</td>
        <td>600</td>
        <td>This limits the size clusters can grow to. The default value, 600, implies that if a cluster contains more than 600 nodes, it will no longer grow.</td>
    </tr>
    <tr>
        <td>activeAreaBoxSize</td>
        <td>Number</td>
        <td>100</td>
        <td>Imagine a square with an edge length of <code>activeAreaBoxSize</code> pixels around your cursor.
            If a cluster is in this box as you zoom in, the cluster can be opened in a seperate sector.
            This is regardless of the zoom level.</td>
    </tr>
  <tr>
    <td>clusterLevelDifference</td>
    <td>Number</td>
    <td>100</td>
    <td>Imagine a square with an edge length of <code>activeAreaBoxSize</code> pixels around your cursor.
      If a cluster is in this box as you zoom in, the cluster can be opened in a seperate sector.
      This is regardless of the zoom level.</td>
    <td>2</td>
    <td>At every clustering session, Graph will check if the difference between cluster levels is
        acceptable. When a cluster is formed when zooming out, that is one cluster level.
        If you zoom out further and it encompasses more nodes, that is another level. For example:
        If the highest level of your graph at any given time is 3, nodes that have not clustered or
        have clustered only once will join their neighbour with the lowest cluster level.</td>
  </tr>
 </table>

--- a/examples/graph/02_random_nodes.html
+++ b/examples/graph/02_random_nodes.html
@ -57,6 +57,7 @@
            j++;
          }


          var from = i;
          var to = j;
          edges.push({
@ -87,7 +88,6 @@
      */
    var options = {
    edges: {
        length: 50
    },
    stabilize: false
    };
@ -102,7 +102,6 @@
 </head>

 <body onload="draw();">

 <form onsubmit="draw(); return false;">
  <label for="nodeCount">Number of nodes:</label>
  <input id="nodeCount" type="text" value="25" style="width: 50px;">
--- a/examples/graph/19_scale_free_graph_clustering.html
+++ b/examples/graph/19_scale_free_graph_clustering.html
@ -88,9 +88,6 @@
      };
      */
    var options = {
    edges: {
        length: 50
    },
    clustering: {
        enabled: clusteringOn,
        clusterEdgeThreshold: clusterEdgeThreshold
--- a/examples/graph/20_navigation.html
+++ b/examples/graph/20_navigation.html
@ -34,6 +34,7 @@
  </style>

  <script type="text/javascript" src="../../dist/vis.js"></script>
  <link type="text/css" rel="stylesheet" charset="UTF-8" href="../../dist/css/graph-navigation.css">

  <script type="text/javascript">
    var nodes = null;
@ -125,7 +126,7 @@
 <body onload="draw();">
 <h2>Navigation controls and keyboad navigation</h2>
 <div style="width: 700px; font-size:14px;">
  This example is the same as example 2, except for the navigation controls that has been activated. The navigation controls are described below. <br /><br />
  This example is the same as example 2, except for the navigation controls that have been activated. The navigation controls are described below. <br /><br />
  <table class="legend_table">
    <tr>
      <td>Icons: </td>
--- a/examples/graph/21_data_manipulation.html
+++ b/examples/graph/21_data_manipulation.html
@ -1,293 +1,214 @@
 <!doctype html>
 <html>
 <head>
  <title>Graph | Navigation</title>
    <title>Graph | Navigation</title>

  <style type="text/css">
    body {
      font: 10pt sans;
    }
    #mygraph {
      width: 600px;
      height: 600px;
      border: 1px solid lightgray;
    }
    table.legend_table {
      font-size: 11px;
      border-width:1px;
      border-color:#d3d3d3;
      border-style:solid;
    }
    table.legend_table,td {
      border-width:1px;
      border-color:#d3d3d3;
      border-style:solid;
      padding: 2px;
    }
    div.table_content {
      width:80px;
      text-align:center;
    }
    div.table_description {
      width:100px;
    }

    div.graph-manipulationDiv {
        border-width:0px;
        border-bottom: 1px;
        border-style:solid;
        border-color: #d6d9d8;
        background: #ffffff; /* Old browsers */
        background: -moz-linear-gradient(top,  #ffffff 0%, #f3f3f3 50%, #ededed 51%, #ffffff 100%); /* FF3.6+ */
        background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#ffffff), color-stop(50%,#f3f3f3), color-stop(51%,#ededed), color-stop(100%,#ffffff)); /* Chrome,Safari4+ */
        background: -webkit-linear-gradient(top,  #ffffff 0%,#f3f3f3 50%,#ededed 51%,#ffffff 100%); /* Chrome10+,Safari5.1+ */
        background: -o-linear-gradient(top,  #ffffff 0%,#f3f3f3 50%,#ededed 51%,#ffffff 100%); /* Opera 11.10+ */
        background: -ms-linear-gradient(top,  #ffffff 0%,#f3f3f3 50%,#ededed 51%,#ffffff 100%); /* IE10+ */
        background: linear-gradient(to bottom,  #ffffff 0%,#f3f3f3 50%,#ededed 51%,#ffffff 100%); /* W3C */
        filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#ffffff', endColorstr='#ffffff',GradientType=0 ); /* IE6-9 */
        width: 600px;
        height:30px;
        z-index:10;
        position:absolute;
    }

    span.manipulationUI {
        font-family: verdana;
        font-size: 12px;
        -moz-border-radius: 15px;
        border-radius: 15px;
        display:inline-block;
        background-position: 0px 0px;
        background-repeat:no-repeat;
        height:24px;
        margin: -14px 0px 0px 10px;
        vertical-align:middle;
        cursor: pointer;
        padding: 0px 8px 0px 8px;
        -webkit-touch-callout: none;
        -webkit-user-select: none;
        -khtml-user-select: none;
        -moz-user-select: none;
        -ms-user-select: none;
        user-select: none;
    }

    span.manipulationUI:hover {
        box-shadow: 1px 1px 8px rgba(0, 0, 0, 0.20);
    }

    span.manipulationUI:active {
        box-shadow: 1px 1px 8px rgba(0, 0, 0, 0.50);
    }

    span.manipulationUI.back {
        background-image: url("../../dist/img/backIcon.png");
    }

    span.manipulationUI.none:hover {
        box-shadow: 1px 1px 8px rgba(0, 0, 0, 0.0);
        cursor: default;
    }
    span.manipulationUI.none:active {
        box-shadow: 1px 1px 8px rgba(0, 0, 0, 0.0);
    }
    span.manipulationUI.none {
        padding: 0px 0px 0px 0px;
    }
    span.manipulationUI.notification{
        margin: 2px;
        font-weight: bold;
    }

    span.manipulationUI.add {
        background-image: url("../../dist/img/addNodeIcon.png");
    }

    span.manipulationUI.edit {
        background-image: url("../../dist/img/editIcon.png");
    }

    span.manipulationUI.connect {
        background-image: url("../../dist/img/connectIcon.png");
    }

    span.manipulationUI.delete {
        background-image: url("../../dist/img/deleteIcon.png");
    }
    span.manipulationUI.acceptDelete {
        background-image: url("../../dist/img/acceptDeleteIcon.png");
    }
    /* top right bottom left */
    span.manipulationLabel {
        margin: 0px 0px 0px 23px;
        line-height: 25px;
    }
    div.seperatorLine {
        display:inline-block;
        width:1px;
        height:20px;
        background-color: #bdbdbd;
        margin: 5px 7px 0px 15px;
    }
    input.manipulatorInput[type="text"] {
        width:80px;
        height:15px;
        font-size:11px;
        margin: 2px 0px 0px 0px;
    }
    input.manipulatorInput[type="button"] {
        width:80px;
        height:22px;
        font-size:12px;
        margin: 2px 0px 0px 10px;
    }

  </style>

  <script type="text/javascript" src="../../dist/vis.js"></script>

  <script type="text/javascript">
    var nodes = null;
    var edges = null;
    var graph = null;

    function draw() {
      nodes = [];
      edges = [];
      var connectionCount = [];

      // randomly create some nodes and edges
      var nodeCount = document.getElementById('nodeCount').value;
      for (var i = 0; i < nodeCount; i++) {
        nodes.push({
          id: i,
          label: String(i)
        });

        connectionCount[i] = 0;

        // create edges in a scale-free-graph way
        if (i == 1) {
          var from = i;
          var to = 0;
          edges.push({
            from: from,
            to: to
          });
          connectionCount[from]++;
          connectionCount[to]++;
    <style type="text/css">
        body {
            font: 10pt sans;
        }
        else if (i > 1) {
          var conn = edges.length * 2;
          var rand = Math.floor(Math.random() * conn);
          var cum = 0;
          var j = 0;
          while (j < connectionCount.length && cum < rand) {
            cum += connectionCount[j];
            j++;
          }

          var from = i;
          var to = j;
          edges.push({
            from: from,
            to: to
          });
          connectionCount[from]++;
          connectionCount[to]++;
        #mygraph {
            position:relative;
            width: 600px;
            height: 600px;
            border: 1px solid lightgray;
        }
        table.legend_table {
            font-size: 11px;
            border-width:1px;
            border-color:#d3d3d3;
            border-style:solid;
        }
        table.legend_table,td {
            border-width:1px;
            border-color:#d3d3d3;
            border-style:solid;
            padding: 2px;
        }
        div.table_content {
            width:80px;
            text-align:center;
        }
        div.table_description {
            width:100px;
        }
      }

      // create a graph
      var container = document.getElementById('mygraph');
      var data = {
        nodes: nodes,
        edges: edges
      };
      /*
       var options = {
       nodes: {
       shape: 'circle'
       },
       edges: {
       length: 50
       },
       stabilize: false
       };
       */
      var options = {
        edges: {
          length: 50
        },
        stabilize: false,
        clustering:true,
        navigation: true,
        keyboard: true,
        dataManipulationToolbar: true
      };
      graph = new vis.Graph(container, data, options);

      // add event listeners
      graph.on('select', function(params) {
        document.getElementById('selection').innerHTML = 'Selection: ' + params.nodes;
      });
    }
  </script>
        #operation {
            font-size:28px;
        }
        #graph-popUp {
            display:none;
            position:absolute;
            top:350px;
            left:170px;
            z-index:299;
            width:250px;
            height:120px;
            background-color: #f9f9f9;
            border-style:solid;
            border-width:3px;
            border-color: #5394ed;
            padding:10px;
            text-align: center;
        }
    </style>
    <link type="text/css" rel="stylesheet" charset="UTF-8" href="../../dist/css/graph-manipulation.css">
    <link type="text/css" rel="stylesheet" charset="UTF-8" href="../../dist/css/graph-navigation.css">
    <script type="text/javascript" src="../../dist/vis.js"></script>

    <script type="text/javascript">
        var nodes = null;
        var edges = null;
        var graph = null;

        function draw() {
            nodes = [];
            edges = [];
            var connectionCount = [];

            // randomly create some nodes and edges
            var nodeCount = 25;
            for (var i = 0; i < nodeCount; i++) {
                nodes.push({
                    id: i,
                    label: String(i)
                });

                connectionCount[i] = 0;

                // create edges in a scale-free-graph way
                if (i == 1) {
                    var from = i;
                    var to = 0;
                    edges.push({
                        from: from,
                        to: to
                    });
                    connectionCount[from]++;
                    connectionCount[to]++;
                }
                else if (i > 1) {
                    var conn = edges.length * 2;
                    var rand = Math.floor(Math.random() * conn);
                    var cum = 0;
                    var j = 0;
                    while (j < connectionCount.length && cum < rand) {
                        cum += connectionCount[j];
                        j++;
                    }

                    var from = i;
                    var to = j;
                    edges.push({
                        from: from,
                        to: to
                    });
                    connectionCount[from]++;
                    connectionCount[to]++;
                }
            }

            // create a graph
            var container = document.getElementById('mygraph');
            var data = {
                nodes: nodes,
                edges: edges
            };
            var options = {
                edges: {
                    length: 50
                },
                stabilize: false,
                dataManipulation: true,
                onAdd: function(data,callback) {
                    var span = document.getElementById('operation');
                    var idInput = document.getElementById('node-id');
                    var labelInput = document.getElementById('node-label');
                    var saveButton = document.getElementById('saveButton');
                    var cancelButton = document.getElementById('cancelButton');
                    var div = document.getElementById('graph-popUp');
                    span.innerHTML = "Add Node";
                    idInput.value = data.id;
                    labelInput.value = data.label;
                    saveButton.onclick = saveData.bind(this,data,callback);
                    cancelButton.onclick = clearPopUp.bind();
                    div.style.display = 'block';
                },
                onEdit: function(data,callback) {
                    var span = document.getElementById('operation');
                    var idInput = document.getElementById('node-id');
                    var labelInput = document.getElementById('node-label');
                    var saveButton = document.getElementById('saveButton');
                    var cancelButton = document.getElementById('cancelButton');
                    var div = document.getElementById('graph-popUp');
                    span.innerHTML = "Edit Node";
                    idInput.value = data.id;
                    labelInput.value = data.label;
                    saveButton.onclick = saveData.bind(this,data,callback);
                    cancelButton.onclick = clearPopUp.bind();
                    div.style.display = 'block';
                }
            };
            graph = new vis.Graph(container, data, options);

            // add event listeners
            graph.on('select', function(params) {
                document.getElementById('selection').innerHTML = 'Selection: ' + params.nodes;
            });

            graph.on("frameResize", function(params) {console.log(params.width,params.height)});

            function clearPopUp() {
                var saveButton = document.getElementById('saveButton');
                var cancelButton = document.getElementById('cancelButton');
                saveButton.onclick = null;
                cancelButton.onclick = null;
                var div = document.getElementById('graph-popUp');
                div.style.display = 'none';

            }

            function saveData(data,callback) {
                var idInput = document.getElementById('node-id');
                var labelInput = document.getElementById('node-label');
                var div = document.getElementById('graph-popUp');
                data.id = idInput.value;
                data.label = labelInput.value;
                clearPopUp();
                callback(data);

            }
        }
    </script>
 </head>

 <body onload="draw();">
 <h2>Navigation controls and keyboad navigation</h2>
 <h2>Editing the dataset</h2>
 <div style="width: 700px; font-size:14px;">
  This example is the same as example 2, except for the navigation controls that has been activated. The navigation controls are described below. <br /><br />
  <table class="legend_table">
    <tr>
      <td>Icons: </td>
      <td><div class="table_content"><img src="../../dist/img/uparrow.png" />     </div></td>
      <td><div class="table_content"><img src="../../dist/img/downarrow.png" />   </div></td>
      <td><div class="table_content"><img src="../../dist/img/leftarrow.png" />   </div></td>
      <td><div class="table_content"><img src="../../dist/img/rightarrow.png" />  </div></td>
      <td><div class="table_content"><img src="../../dist/img/plus.png" />        </div></td>
      <td><div class="table_content"><img src="../../dist/img/minus.png" />       </div></td>
      <td><div class="table_content"><img src="../../dist/img/zoomExtends.png" /> </div></td>
    </tr>
    <tr>
      <td><div class="table_description">Keyboard shortcuts:</div></td>
      <td><div class="table_content">Up arrow</div></td>
      <td><div class="table_content">Down arrow</div></td>
      <td><div class="table_content">Left arrow</div></td>
      <td><div class="table_content">Right arrow</div></td>
      <td><div class="table_content">=<br />[<br />Page up</div></td>
      <td><div class="table_content">-<br />]<br />Page down</div></td>
      <td><div class="table_content">None</div></td>
    </tr>
    <tr>
      <td><div class="table_description">Description:</div></td>
      <td><div class="table_content">Move up</div></td>
      <td><div class="table_content">Move down</div></td>
      <td><div class="table_content">Move left</div></td>
      <td><div class="table_content">Move right</div></td>
      <td><div class="table_content">Zoom in</div></td>
      <td><div class="table_content">Zoom out</div></td>
      <td><div class="table_content">Zoom extends</div></td>
    </tr>
  </table>
  <br />
  Apart from clicking the icons, you can also navigate using the keyboard. The buttons are in table above.
  Zoom Extends changes the zoom and position of the camera to encompass all visible nodes.


    In this example we have enabled the data manipulation setting. If the dataManipulation option is set to true, the edit button will appear.
    If you prefer to have the toolbar visible initially, you can set the initiallyVisible option to true. The exact method is described in the docs.
    <br /><br />
    The data manipulation allows the user to add nodes, connect them, edit them and delete any selected items. In this example we have created trigger functions
    for the add and edit operations. By settings these trigger functions the user can direct the way the data is manipulated. In this example we have created a simple
    pop-up that allows us to edit some of the properties.
 </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="graph-popUp">
    <span id="operation">node</span> <br>
    <table style="margin:auto;"><tr>
        <td>id</td><td><input id="node-id" value="new value"></td>
    </tr>
        <tr>
            <td>label</td><td><input id="node-label" value="new value"> </td>
        </tr></table>
    <input type="button" value="save" id="saveButton"></button>
    <input type="button" value="cancel" id="cancelButton"></button>
 </div>
 <br />
 <div id="mygraph"></div>

 <p id="selection"></p>
 </body>
 </html>

--- a/examples/graph/22_les_miserables.html
+++ b/examples/graph/22_les_miserables.html
@ -0,0 +1,373 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 <html>
 <head>
    <title>Graph | Multiline text</title>

    <style type="text/css">
        #mygraph {
            width: 900px;
            height: 900px;
            border: 1px solid lightgray;
        }
    </style>

    <script type="text/javascript" src="../../dist/vis.js"></script>

    <script type="text/javascript">
        function draw() {
            // create some nodes
            var nodes = [
                        {id:0,"labelIGNORE":"Myriel","group":1},
                        {id:1,"labelIGNORE":"Napoleon","group":1},
                        {id:2,"labelIGNORE":"Mlle.Baptistine","group":1},
                        {id:3,"labelIGNORE":"Mme.Magloire","group":1},
                        {id:4,"labelIGNORE":"CountessdeLo","group":1},
                        {id:5,"labelIGNORE":"Geborand","group":1},
                        {id:6,"labelIGNORE":"Champtercier","group":1},
                        {id:7,"labelIGNORE":"Cravatte","group":1},
                        {id:8,"labelIGNORE":"Count","group":1},
                        {id:9,"labelIGNORE":"OldMan","group":1},
                        {id:10,"labelIGNORE":"Labarre","group":2},
                        {id:11,"labelIGNORE":"Valjean","group":2},
                        {id:12,"labelIGNORE":"Marguerite","group":3},
                        {id:13,"labelIGNORE":"Mme.deR","group":2},
                        {id:14,"labelIGNORE":"Isabeau","group":2},
                        {id:15,"labelIGNORE":"Gervais","group":2},
                        {id:16,"labelIGNORE":"Tholomyes","group":3},
                        {id:17,"labelIGNORE":"Listolier","group":3},
                        {id:18,"labelIGNORE":"Fameuil","group":3},
                        {id:19,"labelIGNORE":"Blacheville","group":3},
                        {id:20,"labelIGNORE":"Favourite","group":3},
                        {id:21,"labelIGNORE":"Dahlia","group":3},
                        {id:22,"labelIGNORE":"Zephine","group":3},
                        {id:23,"labelIGNORE":"Fantine","group":3},
                        {id:24,"labelIGNORE":"Mme.Thenardier","group":4},
                        {id:25,"labelIGNORE":"Thenardier","group":4},
                        {id:26,"labelIGNORE":"Cosette","group":5},
                        {id:27,"labelIGNORE":"Javert","group":4},
                        {id:28,"labelIGNORE":"Fauchelevent","group":0},
                        {id:29,"labelIGNORE":"Bamatabois","group":2},
                        {id:30,"labelIGNORE":"Perpetue","group":3},
                        {id:31,"labelIGNORE":"Simplice","group":2},
                        {id:32,"labelIGNORE":"Scaufflaire","group":2},
                        {id:33,"labelIGNORE":"Woman1","group":2},
                        {id:34,"labelIGNORE":"Judge","group":2},
                        {id:35,"labelIGNORE":"Champmathieu","group":2},
                        {id:36,"labelIGNORE":"Brevet","group":2},
                        {id:37,"labelIGNORE":"Chenildieu","group":2},
                        {id:38,"labelIGNORE":"Cochepaille","group":2},
                        {id:39,"labelIGNORE":"Pontmercy","group":4},
                        {id:40,"labelIGNORE":"Boulatruelle","group":6},
                        {id:41,"labelIGNORE":"Eponine","group":4},
                        {id:42,"labelIGNORE":"Anzelma","group":4},
                        {id:43,"labelIGNORE":"Woman2","group":5},
                        {id:44,"labelIGNORE":"MotherInnocent","group":0},
                        {id:45,"labelIGNORE":"Gribier","group":0},
                        {id:46,"labelIGNORE":"Jondrette","group":7},
                        {id:47,"labelIGNORE":"Mme.Burgon","group":7},
                        {id:48,"labelIGNORE":"Gavroche","group":8},
                        {id:49,"labelIGNORE":"Gillenormand","group":5},
                        {id:50,"labelIGNORE":"Magnon","group":5},
                        {id:51,"labelIGNORE":"Mlle.Gillenormand","group":5},
                        {id:52,"labelIGNORE":"Mme.Pontmercy","group":5},
                        {id:53,"labelIGNORE":"Mlle.Vaubois","group":5},
                        {id:54,"labelIGNORE":"Lt.Gillenormand","group":5},
                        {id:55,"labelIGNORE":"Marius","group":8},
                        {id:56,"labelIGNORE":"BaronessT","group":5},
                        {id:57,"labelIGNORE":"Mabeuf","group":8},
                        {id:58,"labelIGNORE":"Enjolras","group":8},
                        {id:59,"labelIGNORE":"Combeferre","group":8},
                        {id:60,"labelIGNORE":"Prouvaire","group":8},
                        {id:61,"labelIGNORE":"Feuilly","group":8},
                        {id:62,"labelIGNORE":"Courfeyrac","group":8},
                        {id:63,"labelIGNORE":"Bahorel","group":8},
                        {id:64,"labelIGNORE":"Bossuet","group":8},
                        {id:65,"labelIGNORE":"Joly","group":8},
                        {id:66,"labelIGNORE":"Grantaire","group":8},
                        {id:67,"labelIGNORE":"MotherPlutarch","group":9},
                        {id:68,"labelIGNORE":"Gueulemer","group":4},
                        {id:69,"labelIGNORE":"Babet","group":4},
                        {id:70,"labelIGNORE":"Claquesous","group":4},
                        {id:71,"labelIGNORE":"Montparnasse","group":4},
                        {id:72,"labelIGNORE":"Toussaint","group":5},
                        {id:73,"labelIGNORE":"Child1","group":10},
                        {id:74,"labelIGNORE":"Child2","group":10},
                        {id:75,"labelIGNORE":"Brujon","group":4},
                        {id:76,"labelIGNORE":"Mme.Hucheloup","group":8}
                    ];

            // create some edges
            var edges = [
                {"from":1,"to":0,"valueIGNORED":1},
                {"from":2,"to":0,"valueIGNORED":8},
                {"from":3,"to":0,"valueIGNORED":10},
                {"from":3,"to":2,"valueIGNORED":6},
                {"from":4,"to":0,"valueIGNORED":1},
                {"from":5,"to":0,"valueIGNORED":1},
                {"from":6,"to":0,"valueIGNORED":1},
                {"from":7,"to":0,"valueIGNORED":1},
                {"from":8,"to":0,"valueIGNORED":2},
                {"from":9,"to":0,"valueIGNORED":1},
                {"from":11,"to":10,"valueIGNORED":1},
                {"from":11,"to":3,"valueIGNORED":3},
                {"from":11,"to":2,"valueIGNORED":3},
                {"from":11,"to":0,"valueIGNORED":5},
                {"from":12,"to":11,"valueIGNORED":1},
                {"from":13,"to":11,"valueIGNORED":1},
                {"from":14,"to":11,"valueIGNORED":1},
                {"from":15,"to":11,"valueIGNORED":1},
                {"from":17,"to":16,"valueIGNORED":4},
                {"from":18,"to":16,"valueIGNORED":4},
                {"from":18,"to":17,"valueIGNORED":4},
                {"from":19,"to":16,"valueIGNORED":4},
                {"from":19,"to":17,"valueIGNORED":4},
                {"from":19,"to":18,"valueIGNORED":4},
                {"from":20,"to":16,"valueIGNORED":3},
                {"from":20,"to":17,"valueIGNORED":3},
                {"from":20,"to":18,"valueIGNORED":3},
                {"from":20,"to":19,"valueIGNORED":4},
                {"from":21,"to":16,"valueIGNORED":3},
                {"from":21,"to":17,"valueIGNORED":3},
                {"from":21,"to":18,"valueIGNORED":3},
                {"from":21,"to":19,"valueIGNORED":3},
                {"from":21,"to":20,"valueIGNORED":5},
                {"from":22,"to":16,"valueIGNORED":3},
                {"from":22,"to":17,"valueIGNORED":3},
                {"from":22,"to":18,"valueIGNORED":3},
                {"from":22,"to":19,"valueIGNORED":3},
                {"from":22,"to":20,"valueIGNORED":4},
                {"from":22,"to":21,"valueIGNORED":4},
                {"from":23,"to":16,"valueIGNORED":3},
                {"from":23,"to":17,"valueIGNORED":3},
                {"from":23,"to":18,"valueIGNORED":3},
                {"from":23,"to":19,"valueIGNORED":3},
                {"from":23,"to":20,"valueIGNORED":4},
                {"from":23,"to":21,"valueIGNORED":4},
                {"from":23,"to":22,"valueIGNORED":4},
                {"from":23,"to":12,"valueIGNORED":2},
                {"from":23,"to":11,"valueIGNORED":9},
                {"from":24,"to":23,"valueIGNORED":2},
                {"from":24,"to":11,"valueIGNORED":7},
                {"from":25,"to":24,"valueIGNORED":13},
                {"from":25,"to":23,"valueIGNORED":1},
                {"from":25,"to":11,"valueIGNORED":12},
                {"from":26,"to":24,"valueIGNORED":4},
                {"from":26,"to":11,"valueIGNORED":31},
                {"from":26,"to":16,"valueIGNORED":1},
                {"from":26,"to":25,"valueIGNORED":1},
                {"from":27,"to":11,"valueIGNORED":17},
                {"from":27,"to":23,"valueIGNORED":5},
                {"from":27,"to":25,"valueIGNORED":5},
                {"from":27,"to":24,"valueIGNORED":1},
                {"from":27,"to":26,"valueIGNORED":1},
                {"from":28,"to":11,"valueIGNORED":8},
                {"from":28,"to":27,"valueIGNORED":1},
                {"from":29,"to":23,"valueIGNORED":1},
                {"from":29,"to":27,"valueIGNORED":1},
                {"from":29,"to":11,"valueIGNORED":2},
                {"from":30,"to":23,"valueIGNORED":1},
                {"from":31,"to":30,"valueIGNORED":2},
                {"from":31,"to":11,"valueIGNORED":3},
                {"from":31,"to":23,"valueIGNORED":2},
                {"from":31,"to":27,"valueIGNORED":1},
                {"from":32,"to":11,"valueIGNORED":1},
                {"from":33,"to":11,"valueIGNORED":2},
                {"from":33,"to":27,"valueIGNORED":1},
                {"from":34,"to":11,"valueIGNORED":3},
                {"from":34,"to":29,"valueIGNORED":2},
                {"from":35,"to":11,"valueIGNORED":3},
                {"from":35,"to":34,"valueIGNORED":3},
                {"from":35,"to":29,"valueIGNORED":2},
                {"from":36,"to":34,"valueIGNORED":2},
                {"from":36,"to":35,"valueIGNORED":2},
                {"from":36,"to":11,"valueIGNORED":2},
                {"from":36,"to":29,"valueIGNORED":1},
                {"from":37,"to":34,"valueIGNORED":2},
                {"from":37,"to":35,"valueIGNORED":2},
                {"from":37,"to":36,"valueIGNORED":2},
                {"from":37,"to":11,"valueIGNORED":2},
                {"from":37,"to":29,"valueIGNORED":1},
                {"from":38,"to":34,"valueIGNORED":2},
                {"from":38,"to":35,"valueIGNORED":2},
                {"from":38,"to":36,"valueIGNORED":2},
                {"from":38,"to":37,"valueIGNORED":2},
                {"from":38,"to":11,"valueIGNORED":2},
                {"from":38,"to":29,"valueIGNORED":1},
                {"from":39,"to":25,"valueIGNORED":1},
                {"from":40,"to":25,"valueIGNORED":1},
                {"from":41,"to":24,"valueIGNORED":2},
                {"from":41,"to":25,"valueIGNORED":3},
                {"from":42,"to":41,"valueIGNORED":2},
                {"from":42,"to":25,"valueIGNORED":2},
                {"from":42,"to":24,"valueIGNORED":1},
                {"from":43,"to":11,"valueIGNORED":3},
                {"from":43,"to":26,"valueIGNORED":1},
                {"from":43,"to":27,"valueIGNORED":1},
                {"from":44,"to":28,"valueIGNORED":3},
                {"from":44,"to":11,"valueIGNORED":1},
                {"from":45,"to":28,"valueIGNORED":2},
                {"from":47,"to":46,"valueIGNORED":1},
                {"from":48,"to":47,"valueIGNORED":2},
                {"from":48,"to":25,"valueIGNORED":1},
                {"from":48,"to":27,"valueIGNORED":1},
                {"from":48,"to":11,"valueIGNORED":1},
                {"from":49,"to":26,"valueIGNORED":3},
                {"from":49,"to":11,"valueIGNORED":2},
                {"from":50,"to":49,"valueIGNORED":1},
                {"from":50,"to":24,"valueIGNORED":1},
                {"from":51,"to":49,"valueIGNORED":9},
                {"from":51,"to":26,"valueIGNORED":2},
                {"from":51,"to":11,"valueIGNORED":2},
                {"from":52,"to":51,"valueIGNORED":1},
                {"from":52,"to":39,"valueIGNORED":1},
                {"from":53,"to":51,"valueIGNORED":1},
                {"from":54,"to":51,"valueIGNORED":2},
                {"from":54,"to":49,"valueIGNORED":1},
                {"from":54,"to":26,"valueIGNORED":1},
                {"from":55,"to":51,"valueIGNORED":6},
                {"from":55,"to":49,"valueIGNORED":12},
                {"from":55,"to":39,"valueIGNORED":1},
                {"from":55,"to":54,"valueIGNORED":1},
                {"from":55,"to":26,"valueIGNORED":21},
                {"from":55,"to":11,"valueIGNORED":19},
                {"from":55,"to":16,"valueIGNORED":1},
                {"from":55,"to":25,"valueIGNORED":2},
                {"from":55,"to":41,"valueIGNORED":5},
                {"from":55,"to":48,"valueIGNORED":4},
                {"from":56,"to":49,"valueIGNORED":1},
                {"from":56,"to":55,"valueIGNORED":1},
                {"from":57,"to":55,"valueIGNORED":1},
                {"from":57,"to":41,"valueIGNORED":1},
                {"from":57,"to":48,"valueIGNORED":1},
                {"from":58,"to":55,"valueIGNORED":7},
                {"from":58,"to":48,"valueIGNORED":7},
                {"from":58,"to":27,"valueIGNORED":6},
                {"from":58,"to":57,"valueIGNORED":1},
                {"from":58,"to":11,"valueIGNORED":4},
                {"from":59,"to":58,"valueIGNORED":15},
                {"from":59,"to":55,"valueIGNORED":5},
                {"from":59,"to":48,"valueIGNORED":6},
                {"from":59,"to":57,"valueIGNORED":2},
                {"from":60,"to":48,"valueIGNORED":1},
                {"from":60,"to":58,"valueIGNORED":4},
                {"from":60,"to":59,"valueIGNORED":2},
                {"from":61,"to":48,"valueIGNORED":2},
                {"from":61,"to":58,"valueIGNORED":6},
                {"from":61,"to":60,"valueIGNORED":2},
                {"from":61,"to":59,"valueIGNORED":5},
                {"from":61,"to":57,"valueIGNORED":1},
                {"from":61,"to":55,"valueIGNORED":1},
                {"from":62,"to":55,"valueIGNORED":9},
                {"from":62,"to":58,"valueIGNORED":17},
                {"from":62,"to":59,"valueIGNORED":13},
                {"from":62,"to":48,"valueIGNORED":7},
                {"from":62,"to":57,"valueIGNORED":2},
                {"from":62,"to":41,"valueIGNORED":1},
                {"from":62,"to":61,"valueIGNORED":6},
                {"from":62,"to":60,"valueIGNORED":3},
                {"from":63,"to":59,"valueIGNORED":5},
                {"from":63,"to":48,"valueIGNORED":5},
                {"from":63,"to":62,"valueIGNORED":6},
                {"from":63,"to":57,"valueIGNORED":2},
                {"from":63,"to":58,"valueIGNORED":4},
                {"from":63,"to":61,"valueIGNORED":3},
                {"from":63,"to":60,"valueIGNORED":2},
                {"from":63,"to":55,"valueIGNORED":1},
                {"from":64,"to":55,"valueIGNORED":5},
                {"from":64,"to":62,"valueIGNORED":12},
                {"from":64,"to":48,"valueIGNORED":5},
                {"from":64,"to":63,"valueIGNORED":4},
                {"from":64,"to":58,"valueIGNORED":10},
                {"from":64,"to":61,"valueIGNORED":6},
                {"from":64,"to":60,"valueIGNORED":2},
                {"from":64,"to":59,"valueIGNORED":9},
                {"from":64,"to":57,"valueIGNORED":1},
                {"from":64,"to":11,"valueIGNORED":1},
                {"from":65,"to":63,"valueIGNORED":5},
                {"from":65,"to":64,"valueIGNORED":7},
                {"from":65,"to":48,"valueIGNORED":3},
                {"from":65,"to":62,"valueIGNORED":5},
                {"from":65,"to":58,"valueIGNORED":5},
                {"from":65,"to":61,"valueIGNORED":5},
                {"from":65,"to":60,"valueIGNORED":2},
                {"from":65,"to":59,"valueIGNORED":5},
                {"from":65,"to":57,"valueIGNORED":1},
                {"from":65,"to":55,"valueIGNORED":2},
                {"from":66,"to":64,"valueIGNORED":3},
                {"from":66,"to":58,"valueIGNORED":3},
                {"from":66,"to":59,"valueIGNORED":1},
                {"from":66,"to":62,"valueIGNORED":2},
                {"from":66,"to":65,"valueIGNORED":2},
                {"from":66,"to":48,"valueIGNORED":1},
                {"from":66,"to":63,"valueIGNORED":1},
                {"from":66,"to":61,"valueIGNORED":1},
                {"from":66,"to":60,"valueIGNORED":1},
                {"from":67,"to":57,"valueIGNORED":3},
                {"from":68,"to":25,"valueIGNORED":5},
                {"from":68,"to":11,"valueIGNORED":1},
                {"from":68,"to":24,"valueIGNORED":1},
                {"from":68,"to":27,"valueIGNORED":1},
                {"from":68,"to":48,"valueIGNORED":1},
                {"from":68,"to":41,"valueIGNORED":1},
                {"from":69,"to":25,"valueIGNORED":6},
                {"from":69,"to":68,"valueIGNORED":6},
                {"from":69,"to":11,"valueIGNORED":1},
                {"from":69,"to":24,"valueIGNORED":1},
                {"from":69,"to":27,"valueIGNORED":2},
                {"from":69,"to":48,"valueIGNORED":1},
                {"from":69,"to":41,"valueIGNORED":1},
                {"from":70,"to":25,"valueIGNORED":4},
                {"from":70,"to":69,"valueIGNORED":4},
                {"from":70,"to":68,"valueIGNORED":4},
                {"from":70,"to":11,"valueIGNORED":1},
                {"from":70,"to":24,"valueIGNORED":1},
                {"from":70,"to":27,"valueIGNORED":1},
                {"from":70,"to":41,"valueIGNORED":1},
                {"from":70,"to":58,"valueIGNORED":1},
                {"from":71,"to":27,"valueIGNORED":1},
                {"from":71,"to":69,"valueIGNORED":2},
                {"from":71,"to":68,"valueIGNORED":2},
                {"from":71,"to":70,"valueIGNORED":2},
                {"from":71,"to":11,"valueIGNORED":1},
                {"from":71,"to":48,"valueIGNORED":1},
                {"from":71,"to":41,"valueIGNORED":1},
                {"from":71,"to":25,"valueIGNORED":1},
                {"from":72,"to":26,"valueIGNORED":2},
                {"from":72,"to":27,"valueIGNORED":1},
                {"from":72,"to":11,"valueIGNORED":1},
                {"from":73,"to":48,"valueIGNORED":2},
                {"from":74,"to":48,"valueIGNORED":2},
                {"from":74,"to":73,"valueIGNORED":3},
                {"from":75,"to":69,"valueIGNORED":3},
                {"from":75,"to":68,"valueIGNORED":3},
                {"from":75,"to":25,"valueIGNORED":3},
                {"from":75,"to":48,"valueIGNORED":1},
                {"from":75,"to":41,"valueIGNORED":1},
                {"from":75,"to":70,"valueIGNORED":1},
                {"from":75,"to":71,"valueIGNORED":1},
                {"from":76,"to":64,"valueIGNORED":1},
                {"from":76,"to":65,"valueIGNORED":1},
                {"from":76,"to":66,"valueIGNORED":1},
                {"from":76,"to":63,"valueIGNORED":1},
                {"from":76,"to":62,"valueIGNORED":1},
                {"from":76,"to":48,"valueIGNORED":1},
                {"from":76,"to":58,"valueIGNORED":1}
            ];

            // create a graph
            var container = document.getElementById('mygraph');
            var data = {
                nodes: nodes,
                edges: edges

            };
            var options = {nodes: {shape:'circle'},stabilize: false};
            var graph = new vis.Graph(container, data, options);
        }
    </script>
 </head>

 <body onload="draw()">
 <div id="mygraph"></div>
 </body>
 </html>
--- a/examples/graph/index.html
+++ b/examples/graph/index.html
@ -33,6 +33,7 @@
  <p><a href="19_scale_free_graph_clustering.html">19_scale_free_graph_clustering.html</a></p>
  <p><a href="20_navigation.html">20_navigation.html</a></p>
  <p><a href="21_data_manipulation.html">21_data_manipulation.html</a></p>
  <p><a href="22_les_miserables.html">22_les_miserables.html</a></p>
  <p><a href="graphviz/graphviz_gallery.html">graphviz_gallery.html</a></p>

 </div>
--- a/src/graph/Edge.js
+++ b/src/graph/Edge.js
@ -31,11 +31,13 @@ function Edge (properties, graph, constants) {
  this.title  = undefined;
  this.width  = constants.edges.width;
  this.value  = undefined;
  this.length = constants.edges.length;
  this.length = constants.physics.springLength;
  this.selected = false;
  this.smooth = constants.smoothCurves;

  this.from = null;   // a node
  this.to = null;     // a node
  this.via = null;    // a temp node

  // we use this to be able to reconnect the edge to a cluster if its node is put into a cluster
  // by storing the original information we can revert to the original connection when the cluser is opened.
@ -49,13 +51,11 @@ function Edge (properties, graph, constants) {
  // 2012-08-08
  this.dash = util.extend({}, constants.edges.dash); // contains properties length, gap, altLength

  this.stiffness   = undefined; // depends on the length of the edge
  this.color       = constants.edges.color;
  this.widthFixed  = false;
  this.lengthFixed = false;

  this.setProperties(properties, constants);

 }

 /**
@ -74,6 +74,7 @@ Edge.prototype.setProperties = function(properties, constants) {
  if (properties.id !== undefined)             {this.id = properties.id;}
  if (properties.style !== undefined)          {this.style = properties.style;}
  if (properties.label !== undefined)          {this.label = properties.label;}

  if (this.label) {
    this.fontSize = constants.edges.fontSize;
    this.fontFace = constants.edges.fontFace;
@ -82,10 +83,11 @@ Edge.prototype.setProperties = function(properties, constants) {
    if (properties.fontSize !== undefined)   {this.fontSize = properties.fontSize;}
    if (properties.fontFace !== undefined)   {this.fontFace = properties.fontFace;}
  }
  if (properties.title !== undefined)          {this.title = properties.title;}
  if (properties.width !== undefined)          {this.width = properties.width;}
  if (properties.value !== undefined)          {this.value = properties.value;}
  if (properties.length !== undefined)         {this.length = properties.length;}

  if (properties.title !== undefined)        {this.title = properties.title;}
  if (properties.width !== undefined)        {this.width = properties.width;}
  if (properties.value !== undefined)        {this.value = properties.value;}
  if (properties.length !== undefined)       {this.length = properties.length;}

  // Added to support dashed lines
  // David Jordan
@ -103,7 +105,6 @@ Edge.prototype.setProperties = function(properties, constants) {

  this.widthFixed = this.widthFixed || (properties.width !== undefined);
  this.lengthFixed = this.lengthFixed || (properties.length !== undefined);
  this.stiffness = 1 / this.length;

  // set draw method based on style
  switch (this.style) {
@ -211,8 +212,7 @@ Edge.prototype.isOverlappingWith = function(obj) {
  var xObj = obj.left;
  var yObj = obj.top;


  var dist = Edge._dist(xFrom, yFrom, xTo, yTo, xObj, yObj);
  var dist = this._getDistanceToEdge(xFrom, yFrom, xTo, yTo, xObj, yObj);

  return (dist < distMax);
 };
@ -231,7 +231,7 @@ Edge.prototype._drawLine = function(ctx) {
  ctx.lineWidth = this._getLineWidth();

  var point;
  if (this.from != this.to) {
  if (this.from != this.to+9) {
    // draw line
    this._line(ctx);

@ -286,7 +286,12 @@ Edge.prototype._line = function (ctx) {
  // draw a straight line
  ctx.beginPath();
  ctx.moveTo(this.from.x, this.from.y);
  ctx.lineTo(this.to.x, this.to.y);
 if (this.smooth == true) {
      ctx.quadraticCurveTo(this.via.x,this.via.y,this.to.x, this.to.y);
  }
  else {
    ctx.lineTo(this.to.x, this.to.y);
  }
  ctx.stroke();
 };

@ -348,25 +353,70 @@ Edge.prototype._drawDashLine = function(ctx) {
  ctx.strokeStyle = this.color;
  ctx.lineWidth = this._getLineWidth();

  // draw dashed line
  ctx.beginPath();
  ctx.lineCap = 'round';
  if (this.dash.altLength !== undefined) //If an alt dash value has been set add to the array this value
  {
    ctx.dashedLine(this.from.x,this.from.y,this.to.x,this.to.y,
        [this.dash.length,this.dash.gap,this.dash.altLength,this.dash.gap]);
  }
  else if (this.dash.length !== undefined && this.dash.gap !== undefined) //If a dash and gap value has been set add to the array this value
  {
    ctx.dashedLine(this.from.x,this.from.y,this.to.x,this.to.y,
        [this.dash.length,this.dash.gap]);
  }
  else //If all else fails draw a line
  {
  // only firefox and chrome support this method, else we use the legacy one.
  if (ctx.mozDash !== undefined || ctx.setLineDash !== undefined) {
    ctx.beginPath();
    ctx.moveTo(this.from.x, this.from.y);
    ctx.lineTo(this.to.x, this.to.y);

    // configure the dash pattern
    var pattern = [0];
    if (this.dash.length !== undefined && this.dash.gap !== undefined) {
      pattern = [this.dash.length,this.dash.gap];
    }
    else {
      pattern = [5,5];
    }

    // set dash settings for chrome or firefox
    if (typeof ctx.setLineDash !== 'undefined') { //Chrome
      ctx.setLineDash(pattern);
      ctx.lineDashOffset = 0;

    } else { //Firefox
      ctx.mozDash = pattern;
      ctx.mozDashOffset = 0;
    }

    // draw the line
    if (this.smooth == true) {
      ctx.quadraticCurveTo(this.via.x,this.via.y,this.to.x, this.to.y);
    }
    else {
      ctx.lineTo(this.to.x, this.to.y);
    }
    ctx.stroke();

    // restore the dash settings.
    if (typeof ctx.setLineDash !== 'undefined') { //Chrome
      ctx.setLineDash([0]);
      ctx.lineDashOffset = 0;

    } else { //Firefox
      ctx.mozDash = [0];
      ctx.mozDashOffset = 0;
    }
  }
  else { // unsupporting smooth lines
    // draw dashed line
    ctx.beginPath();
    ctx.lineCap = 'round';
    if (this.dash.altLength !== undefined) //If an alt dash value has been set add to the array this value
    {
      ctx.dashedLine(this.from.x,this.from.y,this.to.x,this.to.y,
          [this.dash.length,this.dash.gap,this.dash.altLength,this.dash.gap]);
    }
    else if (this.dash.length !== undefined && this.dash.gap !== undefined) //If a dash and gap value has been set add to the array this value
    {
      ctx.dashedLine(this.from.x,this.from.y,this.to.x,this.to.y,
          [this.dash.length,this.dash.gap]);
    }
    else //If all else fails draw a line
    {
      ctx.moveTo(this.from.x, this.from.y);
      ctx.lineTo(this.to.x, this.to.y);
    }
    ctx.stroke();
  }
  ctx.stroke();

  // draw label
  if (this.label) {
@ -423,10 +473,18 @@ Edge.prototype._drawArrowCenter = function(ctx) {
    // draw line
    this._line(ctx);

    // draw an arrow halfway the line
    var angle = Math.atan2((this.to.y - this.from.y), (this.to.x - this.from.x));
    var length = 10 + 5 * this.width; // TODO: make customizable?
    point = this._pointOnLine(0.5);
    // draw an arrow halfway the line
    if (this.smooth == true) {
      var midpointX = 0.5*(0.5*(this.from.x + this.via.x) + 0.5*(this.to.x + this.via.x));
      var midpointY = 0.5*(0.5*(this.from.y + this.via.y) + 0.5*(this.to.y + this.via.y));
      point = {x:midpointX, y:midpointY};
    }
    else {
      point = this._pointOnLine(0.5);
    }

    ctx.arrow(point.x, point.y, angle, length);
    ctx.fill();
    ctx.stroke();
@ -440,18 +498,18 @@ Edge.prototype._drawArrowCenter = function(ctx) {
  else {
    // draw circle
    var x, y;
    var radius = this.length / 4;
    var radius = 0.25 * Math.max(100,this.length);
    var node = this.from;
    if (!node.width) {
      node.resize(ctx);
    }
    if (node.width > node.height) {
      x = node.x + node.width / 2;
      x = node.x + node.width * 0.5;
      y = node.y - radius;
    }
    else {
      x = node.x + radius;
      y = node.y - node.height / 2;
      y = node.y - node.height * 0.5;
    }
    this._circle(ctx, x, y, radius);

@ -486,32 +544,43 @@ Edge.prototype._drawArrow = function(ctx) {
  ctx.fillStyle = this.color;
  ctx.lineWidth = this._getLineWidth();

  // draw line
  var angle, length;
  //draw a line
  if (this.from != this.to) {
    // calculate length and angle of the line
    angle = Math.atan2((this.to.y - this.from.y), (this.to.x - this.from.x));
    var dx = (this.to.x - this.from.x);
    var dy = (this.to.y - this.from.y);
    var lEdge = Math.sqrt(dx * dx + dy * dy);

    var lFrom = this.from.distanceToBorder(ctx, angle + Math.PI);
    var pFrom = (lEdge - lFrom) / lEdge;
    var xFrom = (pFrom) * this.from.x + (1 - pFrom) * this.to.x;
    var yFrom = (pFrom) * this.from.y + (1 - pFrom) * this.to.y;
    var edgeSegmentLength = Math.sqrt(dx * dx + dy * dy);

    var fromBorderDist = this.from.distanceToBorder(ctx, angle + Math.PI);
    var fromBorderPoint = (edgeSegmentLength - fromBorderDist) / edgeSegmentLength;
    var xFrom = (fromBorderPoint) * this.from.x + (1 - fromBorderPoint) * this