Browse Source

fixed bug in circular images, moved examples

flowchartTest
Alex de Mulder 9 years ago
parent
commit
3f6b206a1f
71 changed files with 6970 additions and 6957 deletions
  1. +6796
    -6789
      dist/vis.js
  2. +3
    -3
      examples/network/basic_usage.html
  3. +3
    -3
      examples/network/data/datasets.html
  4. +0
    -0
      examples/network/data/dotLanguage/data/cellular_automata.gv.txt
  5. +0
    -0
      examples/network/data/dotLanguage/data/computer_network.gv.txt
  6. +0
    -0
      examples/network/data/dotLanguage/data/simple.gv.txt
  7. +3
    -3
      examples/network/data/dotLanguage/dotLanguage.html
  8. +3
    -3
      examples/network/data/dotLanguage/dotPlayground.html
  9. +0
    -0
      examples/network/data/dotLanguage/graphvizGallery/fsm.gv.txt
  10. +0
    -0
      examples/network/data/dotLanguage/graphvizGallery/hello.gv.txt
  11. +0
    -0
      examples/network/data/dotLanguage/graphvizGallery/process.gv.txt
  12. +0
    -0
      examples/network/data/dotLanguage/graphvizGallery/screenshots/fsm.png
  13. +0
    -0
      examples/network/data/dotLanguage/graphvizGallery/screenshots/hello.png
  14. +0
    -0
      examples/network/data/dotLanguage/graphvizGallery/screenshots/softmaint.png
  15. +0
    -0
      examples/network/data/dotLanguage/graphvizGallery/screenshots/traffic_lights.png
  16. +0
    -0
      examples/network/data/dotLanguage/graphvizGallery/siblings.gv.txt
  17. +0
    -0
      examples/network/data/dotLanguage/graphvizGallery/softmaint.gv.txt
  18. +0
    -0
      examples/network/data/dotLanguage/graphvizGallery/traffic_lights.gv.txt
  19. +0
    -0
      examples/network/data/dotLanguage/graphvizGallery/transparency.gv.txt
  20. +0
    -0
      examples/network/data/dotLanguage/graphvizGallery/twopi2.gv.txt
  21. +0
    -0
      examples/network/data/dotLanguage/graphvizGallery/unix.gv.txt
  22. +0
    -0
      examples/network/data/dotLanguage/graphvizGallery/world.gv.txt
  23. +3
    -3
      examples/network/data/dynamic_data.html
  24. +5
    -5
      examples/network/data/importing_from_gephi.html
  25. +3
    -3
      examples/network/data/scaling_custom.html
  26. +3
    -3
      examples/network/data/scaling_nodes_edges.html
  27. +3
    -3
      examples/network/data/scaling_nodes_edges_labels.html
  28. +0
    -0
      examples/network/datasources/WorldCup2014.js
  29. +0
    -0
      examples/network/datasources/WorldCup2014.json
  30. +3
    -3
      examples/network/edgeStyles/arrows.html
  31. +3
    -3
      examples/network/edgeStyles/colors.html
  32. +3
    -3
      examples/network/edgeStyles/dashes.html
  33. +3
    -3
      examples/network/edgeStyles/smooth.html
  34. +4
    -4
      examples/network/edgeStyles/smoothWorldCup.html
  35. +3
    -3
      examples/network/events/interactionEvents.html
  36. +3
    -3
      examples/network/events/physicsEvents.html
  37. +3
    -3
      examples/network/events/renderEvents.html
  38. +3
    -3
      examples/network/exampleApplications/les_miserables.html
  39. +3
    -3
      examples/network/exampleApplications/loadingBar.html
  40. +5
    -5
      examples/network/exampleApplications/neighbourhood_highlight.html
  41. +3
    -3
      examples/network/exampleApplications/nodeLegend.html
  42. +4
    -4
      examples/network/exampleApplications/worldCupPerformance.html
  43. +0
    -0
      examples/network/index.html
  44. +3
    -3
      examples/network/labels/label_alignment.html
  45. +3
    -3
      examples/network/labels/label_background.html
  46. +3
    -3
      examples/network/labels/label_color_and_size.html
  47. +3
    -3
      examples/network/labels/label_stroke.html
  48. +3
    -3
      examples/network/labels/multiline_text.html
  49. +3
    -3
      examples/network/layout/hierarchica_layout_methods.html
  50. +3
    -3
      examples/network/layout/hierarchical_layout.html
  51. +3
    -3
      examples/network/layout/hierarchical_layout_userdefined.html
  52. +3
    -3
      examples/network/layout/randomSeed.html
  53. +3
    -3
      examples/network/nodeStyles/HTML_in_Nodes.html
  54. +4
    -4
      examples/network/nodeStyles/circular_images.html
  55. +3
    -3
      examples/network/nodeStyles/colors.html
  56. +3
    -3
      examples/network/nodeStyles/customGroups.html
  57. +3
    -3
      examples/network/nodeStyles/groups.html
  58. +3
    -3
      examples/network/nodeStyles/icons.html
  59. +4
    -4
      examples/network/nodeStyles/images.html
  60. +3
    -3
      examples/network/nodeStyles/shadows.html
  61. +3
    -3
      examples/network/nodeStyles/shapes.html
  62. +4
    -4
      examples/network/other/animationShowcase.html
  63. +3
    -3
      examples/network/other/clustering.html
  64. +3
    -3
      examples/network/other/clusteringByZoom.html
  65. +4
    -4
      examples/network/other/configuration.html
  66. +4
    -4
      examples/network/other/manipulation.html
  67. +11
    -12
      examples/network/other/navigation.html
  68. +4
    -4
      examples/network/other/performance.html
  69. +4
    -4
      examples/network/physics/physicsConfiguration.html
  70. +2
    -1
      lib/network/modules/components/nodes/shapes/CircularImage.js
  71. +7
    -1
      lib/network/modules/components/nodes/util/CircleImageBase.js

+ 6796
- 6789
dist/vis.js
File diff suppressed because it is too large
View File


examples/network/categories/basic_usage.html → examples/network/basic_usage.html View File

@ -3,8 +3,8 @@
<head>
<title>Network | Basic usage</title>
<script type="text/javascript" src="../../../dist/vis.js"></script>
<link href="../../../dist/vis.css" rel="stylesheet" type="text/css" />
<script type="text/javascript" src="../../dist/vis.js"></script>
<link href="../../dist/vis.css" rel="stylesheet" type="text/css" />
<style type="text/css">
#mynetwork {
@ -50,6 +50,6 @@
var network = new vis.Network(container, data, options);
</script>
<script src="../../googleAnalytics.js"></script>
<script src="../googleAnalytics.js"></script>
</body>
</html>

examples/network/categories/data/datasets.html → examples/network/data/datasets.html View File

@ -3,8 +3,8 @@
<head>
<title>Network | Dynamic Data</title>
<script type="text/javascript" src="../../../../dist/vis.js"></script>
<link href="../../../../dist/vis.css" rel="stylesheet" type="text/css" />
<script type="text/javascript" src="../../../dist/vis.js"></script>
<link href="../../../dist/vis.css" rel="stylesheet" type="text/css" />
<style type="text/css">
#mynetwork {
@ -135,6 +135,6 @@
startNetwork();
</script>
<script src="../../../googleAnalytics.js"></script>
<script src="../../googleAnalytics.js"></script>
</body>
</html>

examples/network/categories/data/dotLanguage/data/cellular_automata.gv.txt → examples/network/data/dotLanguage/data/cellular_automata.gv.txt View File


examples/network/categories/data/dotLanguage/data/computer_network.gv.txt → examples/network/data/dotLanguage/data/computer_network.gv.txt View File


examples/network/categories/data/dotLanguage/data/simple.gv.txt → examples/network/data/dotLanguage/data/simple.gv.txt View File


examples/network/categories/data/dotLanguage/dotLanguage.html → examples/network/data/dotLanguage/dotLanguage.html View File

@ -2,9 +2,9 @@
<head>
<title>Network | DOT Language</title>
<script src="../../../../../dist/vis.js"></script>
<link href="../../../../../dist/vis.css" rel="stylesheet" type="text/css" />
<script src="../../../../googleAnalytics.js"></script>
<script src="../../../../dist/vis.js"></script>
<link href="../../../../dist/vis.css" rel="stylesheet" type="text/css" />
<script src="../../../googleAnalytics.js"></script>
</head>
<body>
<p>

examples/network/categories/data/dotLanguage/dotPlayground.html → examples/network/data/dotLanguage/dotPlayground.html View File

@ -4,8 +4,8 @@
<title>Network | DOT language playground</title>
<script src="http://ajax.googleapis.com/ajax/libs/jquery/1.10.1/jquery.min.js"></script>
<script src="../../../../../dist/vis.js"></script>
<link href="../../../../../dist/vis.css" rel="stylesheet" type="text/css" />
<script src="../../../../dist/vis.js"></script>
<link href="../../../../dist/vis.css" rel="stylesheet" type="text/css" />
<style type="text/css">
body, html {
@ -82,7 +82,7 @@
}
</style>
<script src="../../../../googleAnalytics.js"></script>
<script src="../../../googleAnalytics.js"></script>
</head>
<body>

examples/network/categories/data/dotLanguage/graphvizGallery/fsm.gv.txt → examples/network/data/dotLanguage/graphvizGallery/fsm.gv.txt View File


examples/network/categories/data/dotLanguage/graphvizGallery/hello.gv.txt → examples/network/data/dotLanguage/graphvizGallery/hello.gv.txt View File


examples/network/categories/data/dotLanguage/graphvizGallery/process.gv.txt → examples/network/data/dotLanguage/graphvizGallery/process.gv.txt View File


examples/network/categories/data/dotLanguage/graphvizGallery/screenshots/fsm.png → examples/network/data/dotLanguage/graphvizGallery/screenshots/fsm.png View File


examples/network/categories/data/dotLanguage/graphvizGallery/screenshots/hello.png → examples/network/data/dotLanguage/graphvizGallery/screenshots/hello.png View File


examples/network/categories/data/dotLanguage/graphvizGallery/screenshots/softmaint.png → examples/network/data/dotLanguage/graphvizGallery/screenshots/softmaint.png View File


examples/network/categories/data/dotLanguage/graphvizGallery/screenshots/traffic_lights.png → examples/network/data/dotLanguage/graphvizGallery/screenshots/traffic_lights.png View File


examples/network/categories/data/dotLanguage/graphvizGallery/siblings.gv.txt → examples/network/data/dotLanguage/graphvizGallery/siblings.gv.txt View File


examples/network/categories/data/dotLanguage/graphvizGallery/softmaint.gv.txt → examples/network/data/dotLanguage/graphvizGallery/softmaint.gv.txt View File


examples/network/categories/data/dotLanguage/graphvizGallery/traffic_lights.gv.txt → examples/network/data/dotLanguage/graphvizGallery/traffic_lights.gv.txt View File


examples/network/categories/data/dotLanguage/graphvizGallery/transparency.gv.txt → examples/network/data/dotLanguage/graphvizGallery/transparency.gv.txt View File


examples/network/categories/data/dotLanguage/graphvizGallery/twopi2.gv.txt → examples/network/data/dotLanguage/graphvizGallery/twopi2.gv.txt View File


examples/network/categories/data/dotLanguage/graphvizGallery/unix.gv.txt → examples/network/data/dotLanguage/graphvizGallery/unix.gv.txt View File


examples/network/categories/data/dotLanguage/graphvizGallery/world.gv.txt → examples/network/data/dotLanguage/graphvizGallery/world.gv.txt View File


examples/network/categories/data/dynamic_data.html → examples/network/data/dynamic_data.html View File

@ -52,8 +52,8 @@
}
</style>
<script type="text/javascript" src="../../../../dist/vis.js"></script>
<link href="../../../../dist/vis.css" rel="stylesheet" type="text/css"/>
<script type="text/javascript" src="../../../dist/vis.js"></script>
<link href="../../../dist/vis.css" rel="stylesheet" type="text/css"/>
<script type="text/javascript">
var nodes, edges, network;
@ -166,7 +166,7 @@
}
</script>
<script src="../../../googleAnalytics.js"></script>
<script src="../../googleAnalytics.js"></script>
</head>
<body onload="draw();">

examples/network/categories/data/importing_from_gephi.html → examples/network/data/importing_from_gephi.html View File

@ -4,10 +4,10 @@
<head>
<meta http-equiv="content-type" content="text/html; charset=UTF8">
<title>Dynamic Data - Importing from Gephi (JSON)</title>
<script type="text/javascript" src="../../exampleUtil.js"></script>
<script type="text/javascript" src="../exampleUtil.js"></script>
<script type="text/javascript" src="../../../../dist/vis.js"></script>
<link type="text/css" rel="stylesheet" href="../../../../dist/vis.css">
<script type="text/javascript" src="../../../dist/vis.js"></script>
<link type="text/css" rel="stylesheet" href="../../../dist/vis.css">
<style type="text/css">
#mynetwork {
@ -51,7 +51,7 @@
color: red;
}
</style>
<script src="../../../googleAnalytics.js"></script>
<script src="../../googleAnalytics.js"></script>
</head>
<body>
@ -94,7 +94,7 @@
var nodeContent = document.getElementById('nodeContent');
loadJSON('../../data/WorldCup2014.json', redrawAll, function(err) {console.log('error')});
loadJSON('../data/WorldCup2014.json', redrawAll, function(err) {console.log('error')});
var container = document.getElementById('mynetwork');
var data = {

examples/network/categories/data/scaling_custom.html → examples/network/data/scaling_custom.html View File

@ -14,8 +14,8 @@
}
</style>
<script type="text/javascript" src="../../../../dist/vis.js"></script>
<link href="../../../../dist/vis.css" rel="stylesheet" type="text/css" />
<script type="text/javascript" src="../../../dist/vis.js"></script>
<link href="../../../dist/vis.css" rel="stylesheet" type="text/css" />
<script type="text/javascript">
var nodes = null;
@ -75,7 +75,7 @@
network = new vis.Network(container, data, options);
}
</script>
<script src="../../../googleAnalytics.js"></script>
<script src="../../googleAnalytics.js"></script>
</head>
<body onload="draw()">
<p>

examples/network/categories/data/scaling_nodes_edges.html → examples/network/data/scaling_nodes_edges.html View File

@ -14,8 +14,8 @@
}
</style>
<script type="text/javascript" src="../../../../dist/vis.js"></script>
<link href="../../../../dist/vis.css" rel="stylesheet" type="text/css" />
<script type="text/javascript" src="../../../dist/vis.js"></script>
<link href="../../../dist/vis.css" rel="stylesheet" type="text/css" />
<script type="text/javascript">
var nodes = null;
@ -68,7 +68,7 @@
network = new vis.Network(container, data, options);
}
</script>
<script src="../../../googleAnalytics.js"></script>
<script src="../../googleAnalytics.js"></script>
</head>
<body onload="draw()">
<p>

examples/network/categories/data/scaling_nodes_edges_labels.html → examples/network/data/scaling_nodes_edges_labels.html View File

@ -14,8 +14,8 @@
}
</style>
<script type="text/javascript" src="../../../../dist/vis.js"></script>
<link href="../../../../dist/vis.css" rel="stylesheet" type="text/css" />
<script type="text/javascript" src="../../../dist/vis.js"></script>
<link href="../../../dist/vis.css" rel="stylesheet" type="text/css" />
<script type="text/javascript">
var nodes = null;
@ -74,7 +74,7 @@
network = new vis.Network(container, data, options);
}
</script>
<script src="../../../googleAnalytics.js"></script>
<script src="../../googleAnalytics.js"></script>
</head>
<body onload="draw()">
<p>

examples/network/data/WorldCup2014.js → examples/network/datasources/WorldCup2014.js View File


examples/network/data/WorldCup2014.json → examples/network/datasources/WorldCup2014.json View File


examples/network/categories/edgeStyles/arrows.html → examples/network/edgeStyles/arrows.html View File

@ -3,8 +3,8 @@
<head>
<title>Network | Basic usage</title>
<script type="text/javascript" src="../../../../dist/vis.js"></script>
<link href="../../../../dist/vis.css" rel="stylesheet" type="text/css" />
<script type="text/javascript" src="../../../dist/vis.js"></script>
<link href="../../../dist/vis.css" rel="stylesheet" type="text/css" />
<style type="text/css">
#mynetwork {
@ -56,6 +56,6 @@
var network = new vis.Network(container, data, options);
</script>
<script src="../../../googleAnalytics.js"></script>
<script src="../../googleAnalytics.js"></script>
</body>
</html>

examples/network/categories/edgeStyles/colors.html → examples/network/edgeStyles/colors.html View File

@ -3,8 +3,8 @@
<head>
<title>Network | Basic usage</title>
<script type="text/javascript" src="../../../../dist/vis.js"></script>
<link href="../../../../dist/vis.css" rel="stylesheet" type="text/css" />
<script type="text/javascript" src="../../../dist/vis.js"></script>
<link href="../../../dist/vis.css" rel="stylesheet" type="text/css" />
<style type="text/css">
#mynetwork {
@ -62,6 +62,6 @@
var network = new vis.Network(container, data, options);
</script>
<script src="../../../googleAnalytics.js"></script>
<script src="../../googleAnalytics.js"></script>
</body>
</html>

examples/network/categories/edgeStyles/dashes.html → examples/network/edgeStyles/dashes.html View File

@ -3,8 +3,8 @@
<head>
<title>Network | Basic usage</title>
<script type="text/javascript" src="../../../../dist/vis.js"></script>
<link href="../../../../dist/vis.css" rel="stylesheet" type="text/css" />
<script type="text/javascript" src="../../../dist/vis.js"></script>
<link href="../../../dist/vis.css" rel="stylesheet" type="text/css" />
<style type="text/css">
#mynetwork {
@ -52,6 +52,6 @@
var network = new vis.Network(container, data, options);
</script>
<script src="../../../googleAnalytics.js"></script>
<script src="../../googleAnalytics.js"></script>
</body>
</html>

examples/network/categories/edgeStyles/smooth.html → examples/network/edgeStyles/smooth.html View File

@ -3,8 +3,8 @@
<head>
<title>Network | Static smooth curves</title>
<script type="text/javascript" src="../../../../dist/vis.js"></script>
<link href="../../../../dist/vis.css" rel="stylesheet" type="text/css" />
<script type="text/javascript" src="../../../dist/vis.js"></script>
<link href="../../../dist/vis.css" rel="stylesheet" type="text/css" />
<style type="text/css">
#mynetwork {
@ -13,7 +13,7 @@
border: 1px solid lightgray;
}
</style>
<script src="../../../googleAnalytics.js"></script>
<script src="../../googleAnalytics.js"></script>
</head>
<body>

examples/network/categories/edgeStyles/smoothWorldCup.html → examples/network/edgeStyles/smoothWorldCup.html View File

@ -5,10 +5,10 @@
<meta http-equiv="content-type" content="text/html; charset=UTF8">
<title>Network | Static smooth curves - World Cup Network</title>
<script type="text/javascript" src="../../../../dist/vis.js"></script>
<link type="text/css" rel="stylesheet" href="../../../../dist/vis.css">
<script type="text/javascript" src="../../../dist/vis.js"></script>
<link type="text/css" rel="stylesheet" href="../../../dist/vis.css">
<script src="../../data/WorldCup2014.js"></script>
<script src="../datasources/WorldCup2014.js"></script>
<style type="text/css">
#mynetwork {
@ -20,7 +20,7 @@
height:280px;
}
</style>
<script src="../../../googleAnalytics.js"></script>
<script src="../../googleAnalytics.js"></script>
</head>
<body>

examples/network/categories/events/interactionEvents.html → examples/network/events/interactionEvents.html View File

@ -3,8 +3,8 @@
<head>
<title>Network | Interaction events</title>
<script type="text/javascript" src="../../../../dist/vis.js"></script>
<link href="../../../../dist/vis.css" rel="stylesheet" type="text/css"/>
<script type="text/javascript" src="../../../dist/vis.js"></script>
<link href="../../../dist/vis.css" rel="stylesheet" type="text/css"/>
<style type="text/css">
#mynetwork {
@ -70,6 +70,6 @@
</script>
<script src="../../../googleAnalytics.js"></script>
<script src="../../googleAnalytics.js"></script>
</body>
</html>

examples/network/categories/events/physicsEvents.html → examples/network/events/physicsEvents.html View File

@ -3,8 +3,8 @@
<head>
<title>Network | Basic usage</title>
<script type="text/javascript" src="../../../../dist/vis.js"></script>
<link href="../../../../dist/vis.css" rel="stylesheet" type="text/css"/>
<script type="text/javascript" src="../../../dist/vis.js"></script>
<link href="../../../dist/vis.css" rel="stylesheet" type="text/css"/>
<style type="text/css">
#mynetwork {
@ -68,6 +68,6 @@
</script>
<script src="../../../googleAnalytics.js"></script>
<script src="../../googleAnalytics.js"></script>
</body>
</html>

examples/network/categories/events/renderEvents.html → examples/network/events/renderEvents.html View File

@ -3,8 +3,8 @@
<head>
<title>Network | Basic usage</title>
<script type="text/javascript" src="../../../../dist/vis.js"></script>
<link href="../../../../dist/vis.css" rel="stylesheet" type="text/css"/>
<script type="text/javascript" src="../../../dist/vis.js"></script>
<link href="../../../dist/vis.css" rel="stylesheet" type="text/css"/>
<style type="text/css">
#mynetwork {
@ -78,6 +78,6 @@
</script>
<script src="../../../googleAnalytics.js"></script>
<script src="../../googleAnalytics.js"></script>
</body>
</html>

examples/network/categories/exampleApplications/les_miserables.html → examples/network/exampleApplications/les_miserables.html View File

@ -11,8 +11,8 @@
}
</style>
<script type="text/javascript" src="../../../../dist/vis.js"></script>
<link href="../../../../dist/vis.css" rel="stylesheet" type="text/css"/>
<script type="text/javascript" src="../../../dist/vis.js"></script>
<link href="../../../dist/vis.css" rel="stylesheet" type="text/css"/>
<script type="text/javascript">
function draw() {
@ -383,7 +383,7 @@
}
</script>
<script src="../../../googleAnalytics.js"></script>
<script src="../../googleAnalytics.js"></script>
</head>
<body onload="draw()">

examples/network/categories/exampleApplications/loadingBar.html → examples/network/exampleApplications/loadingBar.html View File

@ -85,8 +85,8 @@
}
</style>
<script type="text/javascript" src="../../../../dist/vis.js"></script>
<link href="../../../../dist/vis.css" rel="stylesheet" type="text/css"/>
<script type="text/javascript" src="../../../dist/vis.js"></script>
<link href="../../../dist/vis.css" rel="stylesheet" type="text/css"/>
<script type="text/javascript">
function draw() {
@ -481,7 +481,7 @@
}
</script>
<script src="../../../googleAnalytics.js"></script>
<script src="../../googleAnalytics.js"></script>
</head>
<body onload="draw()">

examples/network/categories/exampleApplications/neighbourhood_highlight.html → examples/network/exampleApplications/neighbourhood_highlight.html View File

@ -3,10 +3,10 @@
<html><head><meta http-equiv="content-type" content="text/html; charset=UTF8">
<title>Network | Static smooth curves - World Cup Network</title>
<script type="text/javascript" src="../../../../dist/vis.js"></script>
<link type="text/css" rel="stylesheet" href="../../../../dist/vis.css">
<script type="text/javascript" src="../../../dist/vis.js"></script>
<link type="text/css" rel="stylesheet" href="../../../dist/vis.css">
<script src="../../data/WorldCup2014.js"></script>
<script src="../datasources/WorldCup2014.js"></script>
<style type="text/css">
#mynetwork {
@ -15,7 +15,7 @@
border: 1px solid lightgray;
}
</style>
<script src="../../../googleAnalytics.js"></script>
<script src="../../googleAnalytics.js"></script>
</head>
<body>
@ -71,7 +71,7 @@
hideEdgesOnDrag: true
}
};
var data = {nodes:nodesDataset, edges:edgesDataset} // Note: data is coming from ./data/WorldCup2014.js
var data = {nodes:nodesDataset, edges:edgesDataset} // Note: data is coming from ./datasources/WorldCup2014.js
network = new vis.Network(container, data, options);

examples/network/categories/exampleApplications/nodeLegend.html → examples/network/exampleApplications/nodeLegend.html View File

@ -18,8 +18,8 @@
}
</style>
<script type="text/javascript" src="../../../../dist/vis.js"></script>
<link href="../../../../dist/vis.css" rel="stylesheet" type="text/css" />
<script type="text/javascript" src="../../../dist/vis.js"></script>
<link href="../../../dist/vis.css" rel="stylesheet" type="text/css" />
<script type="text/javascript">
var nodes = null;
@ -151,7 +151,7 @@
network = new vis.Network(container, data, options);
}
</script>
<script src="../../../googleAnalytics.js"></script>
<script src="../../googleAnalytics.js"></script>
</head>
<body onload="draw()">

examples/network/categories/exampleApplications/worldCupPerformance.html → examples/network/exampleApplications/worldCupPerformance.html View File

@ -5,10 +5,10 @@
<meta http-equiv="content-type" content="text/html; charset=UTF8">
<title>Network | Static smooth curves - World Cup Network</title>
<script type="text/javascript" src="../../../../dist/vis.js"></script>
<link type="text/css" rel="stylesheet" href="../../../../dist/vis.css">
<script type="text/javascript" src="../../../dist/vis.js"></script>
<link type="text/css" rel="stylesheet" href="../../../dist/vis.css">
<script src="../../data/WorldCup2014.js"></script>
<script src="../datasources/WorldCup2014.js"></script>
<style type="text/css">
#mynetwork {
@ -88,7 +88,7 @@
}
};
// Note: data is coming from ./data/WorldCup2014.js
// Note: data is coming from ./datasources/WorldCup2014.js
network = new vis.Network(container, data, options);
}

examples/network/categories/index.html → examples/network/index.html View File


examples/network/categories/labels/label_alignment.html → examples/network/labels/label_alignment.html View File

@ -3,8 +3,8 @@
<head>
<title>Network | Label alignment</title>
<script type="text/javascript" src="../../../../dist/vis.js"></script>
<link href="../../../../dist/vis.css" rel="stylesheet" type="text/css" />
<script type="text/javascript" src="../../../dist/vis.js"></script>
<link href="../../../dist/vis.css" rel="stylesheet" type="text/css" />
<style type="text/css">
#mynetwork {
@ -16,7 +16,7 @@
max-width:600px;
}
</style>
<script src="../../../googleAnalytics.js"></script>
<script src="../../googleAnalytics.js"></script>
</head>
<body>

examples/network/categories/labels/label_background.html → examples/network/labels/label_background.html View File

@ -3,8 +3,8 @@
<head>
<title>Network | Label alignment</title>
<script type="text/javascript" src="../../../../dist/vis.js"></script>
<link href="../../../../dist/vis.css" rel="stylesheet" type="text/css" />
<script type="text/javascript" src="../../../dist/vis.js"></script>
<link href="../../../dist/vis.css" rel="stylesheet" type="text/css" />
<style type="text/css">
#mynetwork {
@ -16,7 +16,7 @@
max-width:600px;
}
</style>
<script src="../../../googleAnalytics.js"></script>
<script src="../../googleAnalytics.js"></script>
</head>
<body>

examples/network/categories/labels/label_color_and_size.html → examples/network/labels/label_color_and_size.html View File

@ -2,8 +2,8 @@
<html>
<head>
<title>Network | Label stroke</title>
<script type="text/javascript" src="../../../../dist/vis.js"></script>
<link href="../../../../dist/vis.css" rel="stylesheet" type="text/css" />
<script type="text/javascript" src="../../../dist/vis.js"></script>
<link href="../../../dist/vis.css" rel="stylesheet" type="text/css" />
<style type="text/css">
#mynetwork {
@ -16,7 +16,7 @@
max-width:600px;
}
</style>
<script src="../../../googleAnalytics.js"></script>
<script src="../../googleAnalytics.js"></script>
</head>
<body>

examples/network/categories/labels/label_stroke.html → examples/network/labels/label_stroke.html View File

@ -2,8 +2,8 @@
<html>
<head>
<title>Network | Label stroke</title>
<script type="text/javascript" src="../../../../dist/vis.js"></script>
<link href="../../../../dist/vis.css" rel="stylesheet" type="text/css" />
<script type="text/javascript" src="../../../dist/vis.js"></script>
<link href="../../../dist/vis.css" rel="stylesheet" type="text/css" />
<style type="text/css">
#mynetwork {
@ -16,7 +16,7 @@
max-width:600px;
}
</style>
<script src="../../../googleAnalytics.js"></script>
<script src="../../googleAnalytics.js"></script>
</head>
<body>

examples/network/categories/labels/multiline_text.html → examples/network/labels/multiline_text.html View File

@ -11,8 +11,8 @@
}
</style>
<script type="text/javascript" src="../../../../dist/vis.js"></script>
<link href="../../../../dist/vis.css" rel="stylesheet" type="text/css" />
<script type="text/javascript" src="../../../dist/vis.js"></script>
<link href="../../../dist/vis.css" rel="stylesheet" type="text/css" />
<script type="text/javascript">
function draw() {
@ -43,7 +43,7 @@
var network = new vis.Network(container, data, options);
}
</script>
<script src="../../../googleAnalytics.js"></script>
<script src="../../googleAnalytics.js"></script>
</head>
<body onload="draw()">

examples/network/categories/layout/hierarchica_layout_methods.html → examples/network/layout/hierarchica_layout_methods.html View File

@ -14,8 +14,8 @@
}
</style>
<script type="text/javascript" src="../../../../dist/vis.js"></script>
<link href="../../../../dist/vis.css" rel="stylesheet" type="text/css" />
<script type="text/javascript" src="../../../dist/vis.js"></script>
<link href="../../../dist/vis.css" rel="stylesheet" type="text/css" />
<script type="text/javascript">
var network = null;
@ -77,7 +77,7 @@
}
</script>
<script src="../../../googleAnalytics.js"></script>
<script src="../../googleAnalytics.js"></script>
</head>
<body onload="draw();">

examples/network/categories/layout/hierarchical_layout.html → examples/network/layout/hierarchical_layout.html View File

@ -15,9 +15,9 @@
}
</style>
<script type="text/javascript" src="../../exampleUtil.js"></script>
<script type="text/javascript" src="../../../../dist/vis.js"></script>
<link href="../../../../dist/vis.css" rel="stylesheet" type="text/css"/>
<script type="text/javascript" src="../exampleUtil.js"></script>
<script type="text/javascript" src="../../../dist/vis.js"></script>
<link href="../../../dist/vis.css" rel="stylesheet" type="text/css"/>
<script type="text/javascript">

examples/network/categories/layout/hierarchical_layout_userdefined.html → examples/network/layout/hierarchical_layout_userdefined.html View File

@ -13,8 +13,8 @@
border: 1px solid lightgray;
}
</style>
<script type="text/javascript" src="../../../../dist/vis.js"></script>
<link href="../../../../dist/vis.css" rel="stylesheet" type="text/css" />
<script type="text/javascript" src="../../../dist/vis.js"></script>
<link href="../../../dist/vis.css" rel="stylesheet" type="text/css" />
<script type="text/javascript">
@ -96,7 +96,7 @@
}
</script>
<script src="../../../googleAnalytics.js"></script>
<script src="../../googleAnalytics.js"></script>
</head>
<body onload="draw();">

examples/network/categories/layout/randomSeed.html → examples/network/layout/randomSeed.html View File

@ -3,8 +3,8 @@
<head>
<title>Network | Setting the random seed</title>
<script type="text/javascript" src="../../../../dist/vis.js"></script>
<link href="../../../../dist/vis.css" rel="stylesheet" type="text/css" />
<script type="text/javascript" src="../../../dist/vis.js"></script>
<link href="../../../dist/vis.css" rel="stylesheet" type="text/css" />
<style type="text/css">
#mynetwork {
@ -55,6 +55,6 @@
var network = new vis.Network(container, data, options);
</script>
<script src="../../../googleAnalytics.js"></script>
<script src="../../googleAnalytics.js"></script>
</body>
</html>

examples/network/categories/nodeStyles/HTML_in_Nodes.html → examples/network/nodeStyles/HTML_in_Nodes.html View File

@ -16,8 +16,8 @@
</style>
<script type="text/javascript" src="../../../../dist/vis.js"></script>
<link href="../../../../dist/vis.css" rel="stylesheet" type="text/css" />
<script type="text/javascript" src="../../../dist/vis.js"></script>
<link href="../../../dist/vis.css" rel="stylesheet" type="text/css" />
<script type="text/javascript">
var nodes = null;
@ -71,7 +71,7 @@
network = new vis.Network(container, data, options);
}
</script>
<script src="../../../googleAnalytics.js"></script>
<script src="../../googleAnalytics.js"></script>
</head>
<body onload="draw()">

examples/network/categories/nodeStyles/circular_images.html → examples/network/nodeStyles/circular_images.html View File

@ -15,8 +15,8 @@
}
</style>
<script type="text/javascript" src="../../../../dist/vis.js"></script>
<link href="../../../../dist/vis.css" rel="stylesheet" type="text/css" />
<script type="text/javascript" src="../../../dist/vis.js"></script>
<link href="../../../dist/vis.css" rel="stylesheet" type="text/css" />
<script type="text/javascript">
var DIR = 'img/soft-scraps-icons/';
@ -29,7 +29,7 @@
function draw() {
// create people.
// value corresponds with the age of the person
var DIR = '../../img/indonesia/';
var DIR = '../img/indonesia/';
nodes = [
{id: 1, shape: 'circularImage', image: DIR + '1.png'},
{id: 2, shape: 'circularImage', image: DIR + '2.png'},
@ -90,7 +90,7 @@
network = new vis.Network(container, data, options);
}
</script>
<script src="../../../googleAnalytics.js"></script>
<script src="../../googleAnalytics.js"></script>
</head>
<body onload="draw()">

examples/network/categories/nodeStyles/colors.html → examples/network/nodeStyles/colors.html View File

@ -3,8 +3,8 @@
<head>
<title>Network | Basic usage</title>
<script type="text/javascript" src="../../../../dist/vis.js"></script>
<link href="../../../../dist/vis.css" rel="stylesheet" type="text/css" />
<script type="text/javascript" src="../../../dist/vis.js"></script>
<link href="../../../dist/vis.css" rel="stylesheet" type="text/css" />
<style type="text/css">
#mynetwork {
@ -62,6 +62,6 @@
var network = new vis.Network(container, data, options);
</script>
<script src="../../../googleAnalytics.js"></script>
<script src="../../googleAnalytics.js"></script>
</body>
</html>

examples/network/categories/nodeStyles/customGroups.html → examples/network/nodeStyles/customGroups.html View File

@ -18,11 +18,11 @@
}
</style>
<script type="text/javascript" src="../../../../dist/vis.js"></script>
<link href="../../../../dist/vis.css" rel="stylesheet" type="text/css"/>
<script type="text/javascript" src="../../../dist/vis.js"></script>
<link href="../../../dist/vis.css" rel="stylesheet" type="text/css"/>
<link rel="stylesheet" href="http://maxcdn.bootstrapcdn.com/font-awesome/4.3.0/css/font-awesome.min.css">
<script src="../../../googleAnalytics.js"></script>
<script src="../../googleAnalytics.js"></script>
</head>
<body>

examples/network/categories/nodeStyles/groups.html → examples/network/nodeStyles/groups.html View File

@ -18,10 +18,10 @@
}
</style>
<script type="text/javascript" src="../../../../dist/vis.js"></script>
<link href="../../../../dist/vis.css" rel="stylesheet" type="text/css"/>
<script type="text/javascript" src="../../../dist/vis.js"></script>
<link href="../../../dist/vis.css" rel="stylesheet" type="text/css"/>
<script src="../../../googleAnalytics.js"></script>
<script src="../../googleAnalytics.js"></script>
</head>
<body>

examples/network/categories/nodeStyles/icons.html → examples/network/nodeStyles/icons.html View File

@ -5,8 +5,8 @@
<meta charset="UTF-8">
<title>Network | node as icon</title>
<script type="text/javascript" src="../../../../dist/vis.js"></script>
<link href="../../../../dist/vis.css" rel="stylesheet" type="text/css" />
<script type="text/javascript" src="../../../dist/vis.js"></script>
<link href="../../../dist/vis.css" rel="stylesheet" type="text/css" />
<link rel="stylesheet" href="http://maxcdn.bootstrapcdn.com/font-awesome/4.3.0/css/font-awesome.min.css">
<link rel="stylesheet" href="http://code.ionicframework.com/ionicons/2.0.1/css/ionicons.min.css">
@ -174,7 +174,7 @@
var networkIO = new vis.Network(containerIO, dataIO, optionsIO);
}
</script>
<script src="../../../googleAnalytics.js"></script>
<script src="../../googleAnalytics.js"></script>
</head>
<body onload="draw()">
<p>

examples/network/categories/nodeStyles/images.html → examples/network/nodeStyles/images.html View File

@ -11,15 +11,15 @@
}
</style>
<script type="text/javascript" src="../../../../dist/vis.js"></script>
<link href="../../../../dist/vis.css" rel="stylesheet" type="text/css" />
<script type="text/javascript" src="../../../dist/vis.js"></script>
<link href="../../../dist/vis.css" rel="stylesheet" type="text/css" />
<script type="text/javascript">
var nodes = null;
var edges = null;
var network = null;
var DIR = '../../img/refresh-cl/';
var DIR = '../img/refresh-cl/';
var EDGE_LENGTH_MAIN = 150;
var EDGE_LENGTH_SUB = 50;
@ -69,7 +69,7 @@
network = new vis.Network(container, data, options);
}
</script>
<script src="../../../googleAnalytics.js"></script>
<script src="../../googleAnalytics.js"></script>
<body onload="draw()">

examples/network/categories/nodeStyles/shadows.html → examples/network/nodeStyles/shadows.html View File

@ -18,10 +18,10 @@
}
</style>
<script type="text/javascript" src="../../../../dist/vis.js"></script>
<link href="../../../../dist/vis.css" rel="stylesheet" type="text/css"/>
<script type="text/javascript" src="../../../dist/vis.js"></script>
<link href="../../../dist/vis.css" rel="stylesheet" type="text/css"/>
<script src="../../../googleAnalytics.js"></script>
<script src="../../googleAnalytics.js"></script>
</head>
<body>

examples/network/categories/nodeStyles/shapes.html → examples/network/nodeStyles/shapes.html View File

@ -11,8 +11,8 @@
}
</style>
<script type="text/javascript" src="../../../../dist/vis.js"></script>
<link href="../../../../dist/vis.css" rel="stylesheet" type="text/css" />
<script type="text/javascript" src="../../../dist/vis.js"></script>
<link href="../../../dist/vis.css" rel="stylesheet" type="text/css" />
<script type="text/javascript">
var nodes = null;
@ -58,7 +58,7 @@
network = new vis.Network(container, data, options);
}
</script>
<script src="../../../googleAnalytics.js"></script>
<script src="../../googleAnalytics.js"></script>
<body onload="draw()">

examples/network/categories/other/animationShowcase.html → examples/network/other/animationShowcase.html View File

@ -34,9 +34,9 @@
}
</style>
<script type="text/javascript" src="../../exampleUtil.js"></script>
<script type="text/javascript" src="../../../../dist/vis.js"></script>
<link href="../../../../dist/vis.css" rel="stylesheet" type="text/css" />
<script type="text/javascript" src="../exampleUtil.js"></script>
<script type="text/javascript" src="../../../dist/vis.js"></script>
<link href="../../../dist/vis.css" rel="stylesheet" type="text/css" />
<script type="text/javascript">
var nodes = null;
@ -192,7 +192,7 @@
}
}
</script>
<script src="../../../googleAnalytics.js"></script>
<script src="../../googleAnalytics.js"></script>
</head>
<body onload="draw();">

examples/network/categories/other/clustering.html → examples/network/other/clustering.html View File

@ -3,8 +3,8 @@
<head>
<title>Network | Clustering</title>
<script type="text/javascript" src="../../../../dist/vis.js"></script>
<link href="../../../../dist/vis.css" rel="stylesheet" type="text/css" />
<script type="text/javascript" src="../../../dist/vis.js"></script>
<link href="../../../dist/vis.css" rel="stylesheet" type="text/css" />
<style type="text/css">
#mynetwork {
@ -20,7 +20,7 @@
margin-bottom:3px;
}
</style>
<script src="../../../googleAnalytics.js"></script>
<script src="../../googleAnalytics.js"></script>
</head>
<body>

examples/network/categories/other/clusteringByZoom.html → examples/network/other/clusteringByZoom.html View File

@ -3,8 +3,8 @@
<head>
<title>Network | Clustering</title>
<script type="text/javascript" src="../../../../dist/vis.js"></script>
<link href="../../../../dist/vis.css" rel="stylesheet" type="text/css"/>
<script type="text/javascript" src="../../../dist/vis.js"></script>
<link href="../../../dist/vis.css" rel="stylesheet" type="text/css"/>
<style type="text/css">
#mynetwork {
@ -21,7 +21,7 @@
margin-bottom: 3px;
}
</style>
<script src="../../../googleAnalytics.js"></script>
<script src="../../googleAnalytics.js"></script>
</head>
<body>

examples/network/categories/other/configuration.html → examples/network/other/configuration.html View File

@ -27,9 +27,9 @@
</style>
<script type="text/javascript" src="../../exampleUtil.js"></script>
<script type="text/javascript" src="../../../../dist/vis.js"></script>
<link href="../../../../dist/vis.css" rel="stylesheet" type="text/css" />
<script type="text/javascript" src="../exampleUtil.js"></script>
<script type="text/javascript" src="../../../dist/vis.js"></script>
<link href="../../../dist/vis.css" rel="stylesheet" type="text/css" />
<script type="text/javascript">
var nodes = null;
@ -54,7 +54,7 @@
network = new vis.Network(container, data, options);
}
</script>
<script src="../../../googleAnalytics.js"></script>
<script src="../../googleAnalytics.js"></script>
</head>
<body onload="draw();">

examples/network/categories/other/manipulation.html → examples/network/other/manipulation.html View File

@ -52,9 +52,9 @@
text-align: center;
}
</style>
<script type="text/javascript" src="../../exampleUtil.js"></script>
<script type="text/javascript" src="../../../../dist/vis.js"></script>
<link href="../../../../dist/vis.css" rel="stylesheet" type="text/css" />
<script type="text/javascript" src="../exampleUtil.js"></script>
<script type="text/javascript" src="../../../dist/vis.js"></script>
<link href="../../../dist/vis.css" rel="stylesheet" type="text/css" />
<script type="text/javascript">
var nodes = null;
@ -131,7 +131,7 @@
}
</script>
<script src="../../../googleAnalytics.js"></script>
<script src="../../googleAnalytics.js"></script>
</head>
<body onload="draw();">

examples/network/categories/other/navigation.html → examples/network/other/navigation.html View File

@ -27,9 +27,9 @@
}
</style>
<script type="text/javascript" src="../../exampleUtil.js"></script>
<script type="text/javascript" src="../../../../dist/vis.js"></script>
<link href="../../../../dist/vis.css" rel="stylesheet" type="text/css" />
<script type="text/javascript" src="../exampleUtil.js"></script>
<script type="text/javascript" src="../../../dist/vis.js"></script>
<link href="../../../dist/vis.css" rel="stylesheet" type="text/css" />
<script type="text/javascript">
var nodes = null;
@ -57,7 +57,6 @@
// create an array with edges
var edges = new vis.DataSet([
{from: 1, to: 1},
{from: 1, to: 3},
{from: 1, to: 2},
{from: 2, to: 4},
@ -84,7 +83,7 @@
});
}
</script>
<script src="../../../googleAnalytics.js"></script>
<script src="../../googleAnalytics.js"></script>
</head>
<body onload="draw();">
@ -94,13 +93,13 @@
<table class="legend_table">
<tr>
<th>Icons: </th>
<td><img src="../../../../dist/img/network/upArrow.png" /> </td>
<td><img src="../../../../dist/img/network/downArrow.png" /> </td>
<td><img src="../../../../dist/img/network/leftArrow.png" /> </td>
<td><img src="../../../../dist/img/network/rightArrow.png" /> </td>
<td><img src="../../../../dist/img/network/plus.png" /> </td>
<td><img src="../../../../dist/img/network/minus.png" /> </td>
<td><img src="../../../../dist/img/network/zoomExtends.png" /> </td>
<td><img src="../../../dist/img/network/upArrow.png" /> </td>
<td><img src="../../../dist/img/network/downArrow.png" /> </td>
<td><img src="../../../dist/img/network/leftArrow.png" /> </td>
<td><img src="../../../dist/img/network/rightArrow.png" /> </td>
<td><img src="../../../dist/img/network/plus.png" /> </td>
<td><img src="../../../dist/img/network/minus.png" /> </td>
<td><img src="../../../dist/img/network/zoomExtends.png" /> </td>
</tr>
<tr>
<th>Keyboard shortcuts:</th>

examples/network/categories/other/performance.html → examples/network/other/performance.html View File

@ -22,9 +22,9 @@
}
</style>
<script type="text/javascript" src="../../exampleUtil.js"></script>
<script type="text/javascript" src="../../../../dist/vis.js"></script>
<link href="../../../../dist/vis.css" rel="stylesheet" type="text/css" />
<script type="text/javascript" src="../exampleUtil.js"></script>
<script type="text/javascript" src="../../../dist/vis.js"></script>
<link href="../../../dist/vis.css" rel="stylesheet" type="text/css" />
<script type="text/javascript">
var nodes = null;
@ -71,7 +71,7 @@
</script>
<script src="../../../googleAnalytics.js"></script>
<script src="../../googleAnalytics.js"></script>
</head>
<body onload="draw();">
<p>

examples/network/categories/physics/physicsConfiguration.html → examples/network/physics/physicsConfiguration.html View File

@ -22,9 +22,9 @@
</style>
<script type="text/javascript" src="../../exampleUtil.js"></script>
<script type="text/javascript" src="../../../../dist/vis.js"></script>
<link href="../../../../dist/vis.css" rel="stylesheet" type="text/css" />
<script type="text/javascript" src="../exampleUtil.js"></script>
<script type="text/javascript" src="../../../dist/vis.js"></script>
<link href="../../../dist/vis.css" rel="stylesheet" type="text/css" />
<script type="text/javascript">
var nodes = null;
@ -60,7 +60,7 @@
network = new vis.Network(container, data, options);
}
</script>
<script src="../../../googleAnalytics.js"></script>
<script src="../../googleAnalytics.js"></script>
</head>
<body onload="draw();">

+ 2
- 1
lib/network/modules/components/nodes/shapes/CircularImage.js View File

@ -36,7 +36,8 @@ class CircularImage extends CircleImageBase {
this.left = x - this.width / 2;
this.top = y - this.height / 2;
var size = Math.min(0.5*this.height, 0.5*this.width);
let size = Math.min(0.5*this.height, 0.5*this.width);
this._drawRawCircle(ctx, x, y, selected, hover, size);
ctx.save();

+ 7
- 1
lib/network/modules/components/nodes/util/CircleImageBase.js View File

@ -9,6 +9,7 @@ class CircleImageBase extends NodeBase {
_resizeImage() {
if (!this.width || !this.height) { // undefined or 0
var width, height, ratio;
if (this.imageObj.width && this.imageObj.height) { // not undefined or 0
width = 0;
height = 0;
@ -19,7 +20,12 @@ class CircleImageBase extends NodeBase {
height = this.options.size * 2 || this.imageObj.height;
}
else {
ratio = this.imageObj.height / this.imageObj.width;
if (this.imageObj.width && this.imageObj.height) { // not undefined or 0
ratio = this.imageObj.height / this.imageObj.width;
}
else {
ratio = 1;
}
width = this.options.size * 2 || this.imageObj.width;
height = this.options.size * 2 * ratio || this.imageObj.height;
}

Loading…
Cancel
Save