diff --git a/HISTORY.md b/HISTORY.md index 86bee3f5..d9e9e39e 100644 --- a/HISTORY.md +++ b/HISTORY.md @@ -26,7 +26,8 @@ http://visjs.org ### Graph2d & Timeline - Fixed #858, #872, fixed usage of deprecated `unsubscribe` from DataSet. -- Fixed #869: add className with id to custom time bars +- Fixed #869: Add className with id to custom time bars +- Fixed #877: Added support for metaKey to select multiple items. ## 2015-05-22, version 4.0.0 diff --git a/docs/network/index.html b/docs/network/index.html index 176e9fea..0036841a 100644 --- a/docs/network/index.html +++ b/docs/network/index.html @@ -247,10 +247,7 @@ targetNode="eventsDiv">Events
This is a list of all the events in the public API. They are collected here from all individual modules.
@@ -1174,8 +1171,11 @@ var options = {-{ + Object +
{ nodes: [Array of selected nodeIds], edges: [Array of selected edgeIds], event: [Object] original click event, @@ -1186,7 +1186,6 @@ var options = { }
-{ +Object + +Fired when a node (or nodes) has (or have) been deselected by the user. The previous selection is the list of nodes and edges that were selected before the last user event. Passes an object with properties structured as: + -{ nodes: [Array of selected nodeIds], edges: [Array of selected edgeIds], event: [Object] original click event, @@ -1259,10 +1260,6 @@ var options = { }Fired when a node (or nodes) has (or have) been deselected by the user. The previous selection is - the - list of nodes and edges that were selected before the last user event. -
-{ +Object +Fired when a multiple of the -updateInterval
number of iterations is reached. This only occurs in the 'hidden' stabilization. Passes an object with properties structured as: + +{ iterations: Number // iterations so far, total: Number // total iterations in options -} --Fired when a multiple of the updateInterval
number of iterations is reached. This only - occurs in the 'hidden' stabilization. +}
-{ +Object +Fired when the network has stabilized or when the -stopSimulation()
has been called. The amount of iterations it took could be used to tweak the maximum amount of iterations needed to stabilize the network. Passes an object with properties structured as: +{ iterations: Number // iterations it took -} --Fired when the network has stabilized or when the stopSimulation()
has been called. The - amount of iterations it took could be used to tweak the maximum amount of iterations needed to - stabilize - the network. +} +Event triggered by the canvas. @@ -1416,42 +1398,13 @@ var options = { - resize -- +Object +Fired when the size of the canvas has been resized, either by a redraw call when the container div has changed in size, a setSize() call with new values or a setOptions() with new width and/or height values. Passes an object with properties structured as: + + -{ width: Number // the new width of the canvas height: Number // the new height of the canvas @@ -1371,13 +1360,6 @@ var options = { oldHeight: Number // the old height of the canvas }--
-Fired when the size of the canvas has been resized, either by a redraw call when the container div - has - changed in size, a setSize() call with new values or a setOptions() with new width and/or height - values. -- Network supports data in the - DOT language. - To use data in the DOT language, you can use the vis.network.convertDot converter to transform the DOT - language - into a vis.Network compatible nodes, edges and options objects. You can extend the options object with other - options if you'd like. -
- -- Example usage: -
- --// provide data in the DOT language -var DOTstring = 'dinetwork {1 -> 1 -> 2; 2 -> 3; 2 -- 4; 2 -> 1 }'; -var parsedData = vis.network.convertDot(DOTstring); -var data = { - nodes: parsedData.nodes, - edges: parsedData.edges -} +-var options = parsedData.options; +-Network contains conversion utilities to import data from Gephi and graphs in the DOT language.
-// you can extend the options like a normal JSON variable: -options.nodes = { - color: 'red' -} +Import data from Gephi
-// create a network -var network = new vis.Network(container, data, options); - -Network can import data straight from an exported json file from gephi. You can get the JSON exporter here: https://marketplace.gephi.org/plugin/json-exporter/. @@ -1530,8 +1483,45 @@ var network = new vis.Network(container, data);
+ Network supports data in the + DOT language. + To use data in the DOT language, you can use the vis.network.convertDot converter to transform the DOT + language + into a vis.Network compatible nodes, edges and options objects. You can extend the options object with other + options if you'd like. +
+ ++ Example usage: +
+ ++// provide data in the DOT language +var DOTstring = 'dinetwork {1 -> 1 -> 2; 2 -> 3; 2 -- 4; 2 -> 1 }'; +var parsedData = vis.network.convertDot(DOTstring); + +var data = { + nodes: parsedData.nodes, + edges: parsedData.edges +} + +var options = parsedData.options; + +// you can extend the options like a normal JSON variable: +options.nodes = { + color: 'red' +} + +// create a network +var network = new vis.Network(container, data, options); +