added dot and gephi parser to docs, need to include examples in the docs everywhere. Added working example code at the top of the docs and link to example 1

Author: AlexDM0

dist/vis.js

@@ -143,6 +143,12 @@ return /******/ (function(modules) { // webpackBootstrap
     dotparser: __webpack_require__(38),
     gephiParser: __webpack_require__(39)
   };
+  exports.network.convertDot = function (input) {
+    return exports.network.dotparser.DOTToGraph(input);
+  };
+  exports.network.convertGephi = function (input, options) {
+    return exports.network.gephiParser.parseGephi(input, options);
+  };
 
   // Deprecated since v3.0.0
   exports.Graph = function () {
@@ -6451,8 +6457,7 @@ return /******/ (function(modules) { // webpackBootstrap
     // validate options
     var errorFound = Validator.validate(options, allOptions);
     if (errorFound === true) {
-      options = {};
-      console.log('%cErrors have been found in the supplied options object. None of the options will be used.', printStyle);
+      console.log('%cErrors have been found in the supplied options object.', printStyle);
     }
 
     Core.prototype.setOptions.call(this, options);
@@ -15620,15 +15625,15 @@ return /******/ (function(modules) { // webpackBootstrap
 
   var _modulesManipulationSystem2 = _interopRequireDefault(_modulesManipulationSystem);
 
-  var _modulesConfigurationSystem = __webpack_require__(45);
+  var _sharedConfigurationSystem = __webpack_require__(45);
 
-  var _modulesConfigurationSystem2 = _interopRequireDefault(_modulesConfigurationSystem);
+  var _sharedConfigurationSystem2 = _interopRequireDefault(_sharedConfigurationSystem);
 
-  var _modulesValidator = __webpack_require__(46);
+  var _sharedValidator = __webpack_require__(46);
 
-  var _modulesValidator2 = _interopRequireDefault(_modulesValidator);
+  var _sharedValidator2 = _interopRequireDefault(_sharedValidator);
 
-  var _modulesComponentsAllOptionsJs = __webpack_require__(65);
+  var _optionsJs = __webpack_require__(65);
 
   // Load custom shapes into CanvasRenderingContext2D
   __webpack_require__(66);
@@ -15738,7 +15743,7 @@ return /******/ (function(modules) { // webpackBootstrap
     this.canvas._create();
 
     // setup configuration system
-    this.configurationSystem = new _modulesConfigurationSystem2['default'](this, this.body.container, _modulesComponentsAllOptionsJs.configureOptions, this.canvas.pixelRatio);
+    this.configurationSystem = new _sharedConfigurationSystem2['default'](this, this.body.container, _optionsJs.configureOptions, this.canvas.pixelRatio);
 
     // apply options
     this.setOptions(options);
@@ -15757,10 +15762,9 @@ return /******/ (function(modules) { // webpackBootstrap
   Network.prototype.setOptions = function (options) {
     if (options !== undefined) {
 
-      var errorFound = _modulesValidator2['default'].validate(options, _modulesComponentsAllOptionsJs.allOptions);
+      var errorFound = _sharedValidator2['default'].validate(options, _optionsJs.allOptions);
       if (errorFound === true) {
-        options = {};
-        console.log('%cErrors have been found in the supplied options object. None of the options will be used.', _modulesValidator.printStyle);
+        console.log('%cErrors have been found in the supplied options object.', _sharedValidator.printStyle);
       }
 
       // copy the global fields over
@@ -15914,19 +15918,17 @@ return /******/ (function(modules) { // webpackBootstrap
     this.setOptions(data && data.options);
     // set all data
     if (data && data.dot) {
+      console.log('The dot property has been depricated. Please use the static convertDot method to convert DOT into vis.network format and use the normal data format with nodes and edges. This converter is used like this: var data = vis.network.convertDot(dotString);');
       // parse DOT file
-      if (data && data.dot) {
-        var dotData = dotparser.DOTToGraph(data.dot);
-        this.setData(dotData);
-        return;
-      }
+      var dotData = dotparser.DOTToGraph(data.dot);
+      this.setData(dotData);
+      return;
     } else if (data && data.gephi) {
       // parse DOT file
-      if (data && data.gephi) {
-        var gephiData = gephiParser.parseGephi(data.gephi);
-        this.setData(gephiData);
-        return;
-      }
+      console.log('The gephi property has been depricated. Please use the static convertGephi method to convert gephi into vis.network format and use the normal data format with nodes and edges. This converter is used like this: var data = vis.network.convertGephi(gephiJson);');
+      var gephiData = gephiParser.parseGephi(data.gephi);
+      this.setData(gephiData);
+      return;
     } else {
       this.nodesHandler.setData(data && data.nodes, true);
       this.edgesHandler.setData(data && data.edges, true);
@@ -17062,7 +17064,7 @@ return /******/ (function(modules) { // webpackBootstrap
     var nodes = [];
     var options = {
       edges: {
-        inheritColor: true
+        inheritColor: false
       },
       nodes: {
         fixed: false,
@@ -17071,9 +17073,9 @@ return /******/ (function(modules) { // webpackBootstrap
     };
 
     if (options !== undefined) {
-      options.nodes['fixed'] = optionsObj.fixed !== undefined ? options.fixed : false;
+      options.nodes['fixed'] = optionsObj.fixed !== undefined ? options.fixed : true;
       options.nodes['parseColor'] = optionsObj.parseColor !== undefined ? options.parseColor : false;
-      options.edges['inheritColor'] = optionsObj.inheritColor !== undefined ? options.inheritColor : true;
+      options.edges['inheritColor'] = optionsObj.inheritColor !== undefined ? options.inheritColor : false;
     }
 
     var gEdges = gephiJSON.edges;
@@ -17087,8 +17089,9 @@ return /******/ (function(modules) { // webpackBootstrap
       edge['attributes'] = gEdge.attributes;
       //    edge['value'] = gEdge.attributes !== undefined ? gEdge.attributes.Weight : undefined;
       //    edge['width'] = edge['value'] !== undefined ? undefined : edgegEdge.size;
-      edge['color'] = gEdge.color;
-      edge['inheritColor'] = edge['color'] !== undefined ? false : options.inheritColor;
+      if (gEdge.color && options.inheritColor === false) {
+        edge['color'] = gEdge.color;
+      }
       edges.push(edge);
     }
 
@@ -18515,9 +18518,9 @@ return /******/ (function(modules) { // webpackBootstrap
 
   function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError('Cannot call a class as a function'); } }
 
-  var _componentsColorPicker = __webpack_require__(72);
+  var _networkModulesComponentsColorPicker = __webpack_require__(72);
 
-  var _componentsColorPicker2 = _interopRequireDefault(_componentsColorPicker);
+  var _networkModulesComponentsColorPicker2 = _interopRequireDefault(_networkModulesComponentsColorPicker);
 
   var util = __webpack_require__(1);
 
@@ -18557,7 +18560,7 @@ return /******/ (function(modules) { // webpackBootstrap
       this.configureOptions = configureOptions;
       this.moduleOptions = {};
       this.domElements = [];
-      this.colorPicker = new _componentsColorPicker2['default'](pixelRatio);
+      this.colorPicker = new _networkModulesComponentsColorPicker2['default'](pixelRatio);
       this.wrapper;
     }
 
@@ -34192,9 +34195,9 @@ return /******/ (function(modules) { // webpackBootstrap
 
   var _nodesShapesTriangleDown2 = _interopRequireDefault(_nodesShapesTriangleDown);
 
-  var _Validator = __webpack_require__(46);
+  var _sharedValidator = __webpack_require__(46);
 
-  var _Validator2 = _interopRequireDefault(_Validator);
+  var _sharedValidator2 = _interopRequireDefault(_sharedValidator);
 
   var util = __webpack_require__(1);
 

dist/vis.map

@@ -57,33 +57,25 @@ function toggleTable(tableId, parent, clickedRow) {
   }
 }
 
-function toggleTab(showTabId, showDOMid, hideTabId, hideDOMid, hideTabId2, hideDOMid2) {
-  if (hideTabId2 !== undefined) {
-    document.getElementById(hideTabId2).className = '';
-    document.getElementById(hideDOMid2).className = document.getElementById(hideDOMid2).className.replace(' hidden','');
-    document.getElementById(hideDOMid2).className += ' hidden';
-  }
-
-  if (hideTabId !== undefined) {
-    document.getElementById(hideTabId).className = '';
-    document.getElementById(hideDOMid).className = document.getElementById(hideDOMid).className.replace(' hidden','');
-    document.getElementById(hideDOMid).className += ' hidden';
+function toggleTab(tabThis) {
+  var parentNode = tabThis.parentNode;
+  var active = tabThis.className.indexOf('active') !== -1;
+  for (var i = 0; i < parentNode.children.length; i++) {
+    var child = parentNode.children[i];
+    var targetNodeId = child.getAttribute('targetNode');
+    if (targetNodeId) {
+      var targetNode = document.getElementById(child.getAttribute('targetNode'));
+      targetNode.className = targetNode.className.replace(' hidden', '').replace('hidden', '') + ' hidden';
+    }
+    child.className = child.className.replace(' active','').replace('active','');
   }
 
-  document.getElementById(showTabId).className = 'active';
-  document.getElementById(showDOMid).className = document.getElementById(showDOMid).className.replace(' hidden','');
-}
-
-
-function hideOptions(hideTabId1, hidePreId1, hideTabId2, hidePreId2) {
-  document.getElementById(hideTabId1).className = '';
-  document.getElementById(hidePreId1).className = document.getElementById(hidePreId1).className.replace(' hidden','');
-  document.getElementById(hidePreId1).className += ' hidden';
-
-  if (hideTabId2 !== undefined) {
-    document.getElementById(hideTabId2).className = '';
-    document.getElementById(hidePreId2).className = document.getElementById(hidePreId2).className.replace(' hidden','');
-    document.getElementById(hidePreId2).className += ' hidden';
+  // activate the tab
+  tabThis.className += ' active';
+  var ownTargetNodeId = tabThis.getAttribute('targetNode');
+  if (ownTargetNodeId) {
+    var ownTargetNode = document.getElementById(ownTargetNodeId);
+    ownTargetNode.className = ownTargetNode.className.replace(' hidden','').replace('hidden','');
   }
 
 }

dist/vis.min.js

@@ -484,83 +484,6 @@ <h3 id="DOT_language">DOT language</h3>
 
 <h3 id="Gephi_import">Gephi import (JSON)</h3>
 
-<p>
-  network can import data straight from an exported json file from gephi. You can get the JSON exporter here:
-  <a href="https://marketplace.gephi.org/plugin/json-exporter/" target="_blank">https://marketplace.gephi.org/plugin/json-exporter/</a>.
-  An example exists showing how to get a JSON file into Vis: <a href="../examples/network/30_importing_from_gephi.html">30_importing_from_gephi</a>.
-</p>
-
-<p>
-  Example usage:
-</p>
-
-<pre class="prettyprint lang-js">
-// load the JSON file containing the Gephi network.
-var gephiJSON = loadJSON("./data/WorldCup2014.json"); // code in example 30
-
-// create a data object with the gephi key:
-var data = {
-  gephi: gephiJSON
-};
-
-// create a network
-var network = new vis.Network(container, data);
-</pre>
-Alternatively you can use the parser manually:
-<pre class="prettyprint lang-js">
-// load the JSON file containing the Gephi network.
-var gephiJSON = loadJSON("./data/WorldCup2014.json"); // code in example 30
-
-// parse the gephi file to receive an object
-// containing nodes and edges in vis format.
-var parsed = vis.network.gephiParser.parseGephi(gephiJSON);
-
-// provide data in the normal fashion
-var data = {
-  nodes: parsed.nodes,
-  edged: parsed.edges
-};
-
-// create a network
-var network = new vis.Network(container, data);
-</pre>
-
-<h4>Gephi parser options</h4>
-
-There are a few options you can use to tell Vis what to do with the data from Gephi.
-
-<pre class="prettyprint lang-js">
-var parserOptions = {
-  allowedToMove: false,
-  parseColor: false
-}
-var parsed = vis.network.gephiParser.parseGephi(gephiJSON, parserOptions);
-</pre>
-<table>
-  <tr>
-    <th>Name</th>
-    <th>Type</th>
-    <th>Default</th>
-    <th>Description</th>
-  </tr>
-
-  <tr>
-    <td>allowedToMove</td>
-    <td>Boolean</td>
-    <td>false</td>
-    <td>
-      If true, the nodes will move according to the physics model after import. If false, the nodes do not move at all.
-    </td>
-  </tr>
-  <tr>
-    <td>parseColor</td>
-    <td>Boolean</td>
-    <td>false</td>
-    <td>
-      If true, the color will be parsed by the vis parser, generating extra colors for the borders, highlighs and hover. If false, the node will be the supplied color.
-    </td>
-  </tr>
-</table>
 
 <h2 id="Configuration_options">Configuration options</h2>
 

docs/js/toggleTable.js

@@ -89,9 +89,9 @@ <h3>Options</h3>
     <p>The options for the canvas have to be contained in an object titled 'configure'.</p>
     <p>Click on the full options or shorthand options to show how these options are supposed to be used.</p>
     <ul class="nav nav-tabs">
-        <li role="presentation" class="active" onclick="hideOptions('fullTab','fullOptions','shortTab','shortOptions');" id="hiddenTab"><a href="#">options hidden</a></li>
-        <li role="presentation" onclick="toggleTab('fullTab','fullOptions','shortTab','shortOptions');" id="fullTab"><a href="#">full options</a></li>
-        <li role="presentation" onclick="toggleTab('shortTab','shortOptions','fullTab','fullOptions');" id="shortTab"><a href="#">shorthand options</a></li>
+        <li role="presentation" class="active" onclick="toggleTab(this)"><a href="#">options hidden</a></li>
+        <li role="presentation" onclick="toggleTab(this);" targetNode="fullOptions"><a href="#">full options</a></li>
+        <li role="presentation" onclick="toggleTab(this);" targetNode="shortOptions"><a href="#">shorthand options</a></li>
     </ul>
     <br>
 <pre class="prettyprint lang-js options top hidden" id="fullOptions">

docs/network.html

@@ -94,9 +94,9 @@ <h3>Options</h3>
     </p>
     <p>Click on the full options or shorthand options to show how these options are supposed to be used.</p>
     <ul class="nav nav-tabs">
-        <li role="presentation" class="active" onclick="hideOptions('fullTab','fullOptions','shortTab','shortOptions');" id="hiddenTab"><a href="#">options hidden</a></li>
-        <li role="presentation" onclick="toggleTab('fullTab','fullOptions','shortTab','shortOptions');" id="fullTab"><a href="#">full options</a></li>
-        <li role="presentation" onclick="toggleTab('shortTab','shortOptions','fullTab','fullOptions');" id="shortTab"><a href="#">shorthand options</a></li>
+        <li role="presentation" class="active" onclick="toggleTab(this)"><a href="#">options hidden</a></li>
+        <li role="presentation" onclick="toggleTab(this);" targetNode="fullOptions"><a href="#">full options</a></li>
+        <li role="presentation" onclick="toggleTab(this);" targetNode="shortOptions"><a href="#">shorthand options</a></li>
     </ul>
     <br>
 <pre class="prettyprint lang-js options top hidden" id="fullOptions">

docs/network/configure.html

@@ -88,8 +88,8 @@ <h3>Options</h3>
     <p>The options for the canvas have to be contained in an object titled 'groups'.</p>
     <p>Click on the options shown to show how these options are supposed to be used.</p>
     <ul class="nav nav-tabs">
-        <li role="presentation" class="active" onclick="hideOptions('fullTab','fullOptions');" id="hiddenTab"><a href="#">options hidden</a></li>
-        <li role="presentation" onclick="toggleTab('fullTab','fullOptions');" id="fullTab"><a href="#">options shown</a></li>
+        <li role="presentation" class="active" onclick="toggleTab(this)"><a href="#">options hidden</a></li>
+        <li role="presentation" onclick="toggleTab(this);" targetNode="fullOptions"><a href="#">options shown</a></li>
     </ul>
     <br>
 <pre class="prettyprint lang-js options hidden" id="fullOptions">

docs/network/edges.html

@@ -75,9 +75,9 @@ <h3>Options</h3>
     <p>The options for the interaction module have to be contained in an object titled 'interaction'.</p>
     <p>Click on the full options or shorthand options to show how these options are supposed to be used.</p>
     <ul class="nav nav-tabs">
-        <li role="presentation" class="active" onclick="hideOptions('fullTab','fullOptions','shortTab','shortOptions');" id="hiddenTab"><a href="#">options hidden</a></li>
-        <li role="presentation" onclick="toggleTab('fullTab','fullOptions','shortTab','shortOptions');" id="fullTab"><a href="#">full options</a></li>
-        <li role="presentation" onclick="toggleTab('shortTab','shortOptions','fullTab','fullOptions');" id="shortTab"><a href="#">shorthand options</a></li>
+        <li role="presentation" class="active" onclick="toggleTab(this)"><a href="#">options hidden</a></li>
+        <li role="presentation" onclick="toggleTab(this);" targetNode="fullOptions"><a href="#">full options</a></li>
+        <li role="presentation" onclick="toggleTab(this);" targetNode="shortOptions"><a href="#">shorthand options</a></li>
     </ul>
     <br>
 <pre class="prettyprint lang-js options top hidden" id="fullOptions">

docs/network/groups.html

@@ -76,9 +76,9 @@ <h3>Options</h3>
     <p>The options for the layout module have to be contained in an object titled 'layout'.</p>
     <p>Click on the full options or shorthand options to show how these options are supposed to be used.</p>
     <ul class="nav nav-tabs">
-        <li role="presentation" class="active" onclick="hideOptions('fullTab','fullOptions','shortTab','shortOptions');" id="hiddenTab"><a href="#">options hidden</a></li>
-        <li role="presentation" onclick="toggleTab('fullTab','fullOptions','shortTab','shortOptions');" id="fullTab"><a href="#">full options</a></li>
-        <li role="presentation" onclick="toggleTab('shortTab','shortOptions','fullTab','fullOptions');" id="shortTab"><a href="#">shorthand options</a></li>
+        <li role="presentation" class="active" onclick="toggleTab(this)"><a href="#">options hidden</a></li>
+        <li role="presentation" onclick="toggleTab(this);" targetNode="fullOptions"><a href="#">full options</a></li>
+        <li role="presentation" onclick="toggleTab(this);" targetNode="shortOptions"><a href="#">shorthand options</a></li>
     </ul>
     <br>
 <pre class="prettyprint lang-js options top hidden" id="fullOptions">

docs/network/interaction.html

@@ -75,9 +75,9 @@ <h3>Options</h3>
     <p>The options for the manipulation module have to be contained in an object titled 'manipulation'.</p>
     <p>Click on the full options or shorthand options to show how these options are supposed to be used.</p>
     <ul class="nav nav-tabs">
-        <li role="presentation" class="active" onclick="hideOptions('fullTab','fullOptions','shortTab','shortOptions');" id="hiddenTab"><a href="#">options hidden</a></li>
-        <li role="presentation" onclick="toggleTab('fullTab','fullOptions','shortTab','shortOptions');" id="fullTab"><a href="#">full options</a></li>
-        <li role="presentation" onclick="toggleTab('shortTab','shortOptions','fullTab','fullOptions');" id="shortTab"><a href="#">shorthand options</a></li>
+        <li role="presentation" class="active" onclick="toggleTab(this)"><a href="#">options hidden</a></li>
+        <li role="presentation" onclick="toggleTab(this);" targetNode="fullOptions"><a href="#">full options</a></li>
+        <li role="presentation" onclick="toggleTab(this);" targetNode="shortOptions"><a href="#">shorthand options</a></li>
     </ul>
     <br>
 <pre class="prettyprint lang-js options top hidden" id="fullOptions">