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

9 years ago · 315ad7cfda
--- a/examples/network/25_physics_configuration.html
+++ b/examples/network/25_physics_configuration.html
@ -78,8 +78,12 @@
      };

    var options = {
        stabilize: false,
        configurePhysics:true
        physics: {
          stabilization: false
        },
        configure: {
          filter: 'physics'
        }
    };
      network = new vis.Network(container, data, options);

@ -89,7 +93,8 @@
      });
    }
  </script>
 <script>(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)})(window,document,'script','//www.google-analytics.com/analytics.js','ga');ga('create', 'UA-61231638-1', 'auto');ga('send', 'pageview');</script></head>
  <script src="../googleAnalytics.js"></script>
 </head>

 <body onload="draw();">

--- a/examples/network/26_staticSmoothCurves.html
+++ b/examples/network/26_staticSmoothCurves.html
@ -13,7 +13,8 @@
      border: 1px solid lightgray;
    }
  </style>
 <script>(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)})(window,document,'script','//www.google-analytics.com/analytics.js','ga');ga('create', 'UA-61231638-1', 'auto');ga('send', 'pageview');</script></head>
  <script src="../googleAnalytics.js"></script>
 </head>

 <body>

@ -30,8 +31,9 @@
    <br /> <br />
 </div>

 Smooth curve type:
 <select id="dropdownID">
 <p>
  Smooth curve type:
  <select id="dropdownID">
    <option value="continuous" selected="selected">continuous</option>
    <option value="discrete">discrete</option>
    <option value="diagonalCross">diagonalCross</option>
@ -40,18 +42,22 @@ Smooth curve type:
    <option value="vertical">vertical</option>
    <option value="curvedCW">curvedCW</option>
    <option value="curvedCCW">curvedCCW</option>
 </select><br/>
 Roundness (0..1): <input type="range" min="0" max="1" value="0.5" step="0.05" style="width:200px" id="roundnessSlider"> <input id="roundnessScreen" value="0.5"> (0.5 is max roundness for continuous, 1.0 for the others)
  </select>
 </p>
 <p>
  Roundness (0..1): <input type="range" min="0" max="1" value="0.5" step="0.05" style="width:200px" id="roundnessSlider"> <input id="roundnessScreen" value="0.5"> (0.5 is max roundness for continuous, 1.0 for the others)
 </p>

 <div id="mynetwork"></div>

 <script type="text/javascript">

 var dropdown = document.getElementById("dropdownID");
 dropdown.onchange = update;
 var roundnessSlider = document.getElementById("roundnessSlider");
 roundnessSlider.onchange = update;
  var dropdown = document.getElementById("dropdownID");
  dropdown.onchange = update;
  var roundnessSlider = document.getElementById("roundnessSlider");
  roundnessSlider.onchange = update;

 var roundnessScreen = document.getElementById("roundnessScreen");
  var roundnessScreen = document.getElementById("roundnessScreen");
  // create an array with nodes
  var nodes = [
    {id: 1, label: 'Node 1'},
@ -69,20 +75,40 @@ var roundnessScreen = document.getElementById("roundnessScreen");
    nodes: nodes,
    edges: edges
  };
  var options = {physics:{barnesHut:{gravitationalConstant:0, springConstant:0, centralGravity: 0}},
  smoothCurves:{dynamic:false, type: '1'}};
  var options = {
    physics:{
      barnesHut: {
        gravitationalConstant:0,
        springConstant:0,
        centralGravity: 0
      }
    },
    edges: {
      smooth: {
        dynamic: false,
        type: '1'
      }
    }
  };
  var network = new vis.Network(container, data, options);

    function update() {
        var type = dropdown.value;
        var roundness = roundnessSlider.value;
        roundnessScreen.value = roundness;
        var options = {smoothCurves:{type:type, roundness:roundness}}
  function update() {
    var type = dropdown.value;
    var roundness = parseFloat(roundnessSlider.value);
    roundnessScreen.value = roundness;
    var options = {
      edges: {
        smooth: {
          type: type,
          roundness: roundness
        }
      }
    };

        network.setOptions(options);
    }
    network.setOptions(options);
  }

    update();
  update();
 </script>

 </body>
--- a/examples/network/27_world_cup_network.html
+++ b/examples/network/27_world_cup_network.html
--- a/examples/network/28_world_cup_network_performance.html
+++ b/examples/network/28_world_cup_network_performance.html
--- a/examples/network/29_neighbourhood_highlight.html
+++ b/examples/network/29_neighbourhood_highlight.html
--- a/examples/network/data/WorldCup2014.js
+++ b/examples/network/data/WorldCup2014.js