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

docs/graph2d.html

@@ -280,7 +280,7 @@ The options colored in green can also be used as options for the groups. All opt
   <td class="greenField">yAxisOrientation</td>
   <td>String</td>
   <td>'left'</td>
-  <td>This defines with which axis, left or right, the graph is coupled. <a href="../examples/Graph2d/05_bothAxis.html">Example 5</a> shows groups with different Y axis. If no groups are coupled
+  <td>This defines with which axis, left or right, the graph is coupled. <a href="../examples/graph2d/05_bothAxis.html">Example 5</a> shows groups with different Y axis. If no groups are coupled
     with an axis, it will not be shown.</td>
 </tr>
 <tr>
@@ -373,7 +373,7 @@ The options colored in green can also be used as options for the groups. All opt
   <td class="greenField">catmullRom.parametrization</td>
   <td>String</td>
   <td>'centripetal'</td>
-  <td>Define the type of parametrizaion. <a href="../examples/Graph2d/07_scrollingAndSorting.html">Example 7</a> shows the different methods. The options are 'centripetal' (best results), 'chordal' and 'uniform'. Uniform is the computationally cheapest variant.
+  <td>Define the type of parametrizaion. <a href="../examples/graph2d/07_scrollingAndSorting.html">Example 7</a> shows the different methods. The options are 'centripetal' (best results), 'chordal' and 'uniform'. Uniform is the computationally cheapest variant.
     If catmullRom is disabled, linear interpolation is used.</td>
 </tr>
 <tr>
@@ -435,7 +435,7 @@ The options colored in green can also be used as options for the groups. All opt
   <td>Object</td>
   <td></td>
   <td>You can use this to toggle the visibility of groups per graph2D instance. This is different from setting the visibility flag of the groups since
-    this is not communicated across instances of graph2d. Take a look at <a href="../examples/Graph2d/14_toggleGroups.html">Example 14</a>
+    this is not communicated across instances of graph2d. Take a look at <a href="../examples/graph2d/14_toggleGroups.html">Example 14</a>
     for more explaination.
   </td>
 </tr>
@@ -987,8 +987,8 @@ Graph2d comes with support for the following locales:
 </p>
 <p>
   Additionally, Graph2d has 10 preset styles for graphs, which are cycled through when loading groups. These styles can be overwritten
-  as well, along with defining your own classes to style the graphs! <a href="../examples/Graph2d/04_rightAxis.html">Example 4</a> and
-  <a href="../examples/Graph2d/05_bothAxis.html">example 5</a> show the usage of custom styles.
+  as well, along with defining your own classes to style the graphs! <a href="../examples/graph2d/04_rightAxis.html">Example 4</a> and
+  <a href="../examples/graph2d/05_bothAxis.html">example 5</a> show the usage of custom styles.
 </p>
 
 <h2 id="Data_Policy">Data Policy</h2>

docs/network.html

@@ -2037,7 +2037,7 @@ var options: {
 <h3 id="Keyboard_navigation">Keyboard navigation</h3>
 <p>
   The network can be navigated using shortcut keys.
-  The default state for the keyboard navigation is <b>off</b>. The predefined keys can be found in the example <a href="../examples/Network/20_navigation.html">20_navigation.html</a>.
+  The default state for the keyboard navigation is <b>off</b>. The predefined keys can be found in the example <a href="../examples/network/20_navigation.html">20_navigation.html</a>.
 </p>
 
 <pre class="prettyprint">
@@ -2092,7 +2092,7 @@ var options: {
 <p>
   The network can be used to display nodes in a hierarchical way. This can be determined automatically, based on the amount of edges connected to each node, or defined by the user.
   If the user wants to manually determine the hierarchy, each node has to be supplied with a level (from 0 being heighest to n). The automatic method
-  is shown in <a href="../examples/Network/23_hierarchical_layout.html">example 23</a> and the user-defined method is shown in <a href="../examples/Network/24_hierarchical_layout_userdefined.html">example 24</a>.
+  is shown in <a href="../examples/Network/23_hierarchical_layout.html">example 23</a> and the user-defined method is shown in <a href="../examples/network/24_hierarchical_layout_userdefined.html">example 24</a>.
   This layout method does not support smooth curves or clustering. It automatically turns these features off.
 </p>
 

lib/network/Edge.js

@@ -309,14 +309,14 @@ Edge.prototype._drawLine = function(ctx) {
  */
 Edge.prototype._getLineWidth = function() {
   if (this.selected == true) {
-    return Math.min(this.widthSelected, this.options.widthMax)*this.networkScaleInv;
+    return  Math.max(Math.min(this.widthSelected, this.options.widthMax), 0.3*this.networkScaleInv);
   }
   else {
     if (this.hover == true) {
-      return Math.min(this.options.hoverWidth, this.options.widthMax)*this.networkScaleInv;
+      return Math.max(Math.min(this.options.hoverWidth, this.options.widthMax), 0.3*this.networkScaleInv);
     }
     else {
-      return this.options.width*this.networkScaleInv;
+      return Math.max(this.options.width, 0.3*this.networkScaleInv);
     }
   }
 };