Merge remote-tracking branch 'origin/gh-pages' into gh-pages

blog.html

@@ -234,10 +234,10 @@
             </p>
 
             <p>
-                We know it is annoying to go back to your code and making the required changes but I guarantee that it
+                We know it is annoying to go back to your code and making the required changes, but I guarantee that it
                 is for the best. To help with this migration, we have included an option validator to our new release.
-                This validator is currently applied on the network, timeline and graph2d. It checks the options you
-                supply if they are of the right type. If your options do not exist or if the type is wrong, it will give
+                This validator is currently applied on the network, timeline and graph2d. It checks if the options you
+                supply are of the right type. If your options do not exist or if the type is wrong, it will give
                 you an understandable message with suggestions of options you may have meant. We think this will make
                 developing for vis a lot easier, as well as the migration from v3 to v4.
             </p>
@@ -245,8 +245,8 @@
             <p>
                 The biggest change in this release is in the network module. We have rewritten the network module in
                 full and the results are cleanly separated ES6 modules. The option structure has been changed to suit
-                this structure. The options have also been grouped, making it easier to document and understand. An
-                example of this is the options for fonts. It used to be fontColor, fontFace fontSize, which is now
+                this structure. The options have also been grouped, making it easier to document and understand. For example,
+                lets look at the options for fonts. It used to be fontColor, fontFace fontSize, which is now
                 grouped in a font object with {color:’’,face:’’,size:’’}. Also completely new is the clustering
                 mechanism. It used to be mostly automatic and twitchy but this new version gives all the control to the
                 user. This should make the clustering very useful and I’ll be happy to hear of missing features for
@@ -254,29 +254,29 @@
             </p>
 
             <p>
-                We have moved to hammer.js 2 for all of our touch and click events and a lot of work has gone into
+                We have moved to hammer.js 2 for all of our touch and click events, and a lot of work has gone into
                 updating all the css elements (especially for timeline) to eliminate conflicts with large frameworks
                 that overload <i>everything</i>.
             </p>
 
             <p>
                 Over the last year, we have received a lot of issues on our Github page for which we are very thankful.
-                Whether it is a bug report, question or feature request, we handle all of them as quickly as we can and
+                Whether it is a bug report, question or feature request, we handle all of them as quickly as we can, and
                 with these big new rewrites it gives us a new perspective on what is important. We hope the validator
                 will prevent a lot of issues. The new examples have also been designed to more clearly show simple
-                options. We plan to provide links to JSBin for all options but this is a lot of work (for which we
+                options. We plan to provide links to JSBin for all options, but this is a lot of work (for which we
                 wouldn’t mind some help ;) ).
             </p>
 
             <p>
                 So what’s next? Well the next module that really needs a good overhaul is the graph2d. This module is
-                used by us internally quite a lot and we need to improve the architecture and make it easy to extend it
+                used by us internally quite a lot, and we need to improve the architecture and make it easy to extend it
                 with new graph types.
             </p>
 
             <p>
                 We want to unify the code between the timeline and the graph2d even more. The ideal result would be
-                using a graph2d as a group in the timeline or use the timeline items in a graph2d without nasty hacks.
+                using a graph2d as a group in the timeline, or use the timeline items in a graph2d without nasty hacks.
                 The graph2d should get numeric x axis (so not necessarily only time), logarithmic axis and hopefully the
                 architecture will be flexible enough to allow the x and y axis to be interchanged. The API across the
                 modules will also be further unified, and I think we’ve made a great start with v4!

featureRequests.html

@@ -135,21 +135,21 @@ Legend:
 <h3 id="network">Network</h3>
 <ul>
     <li class="normal">(<a href="https://github.com/almende/vis/issues/824" target="_blank">824</a>) Check label for click event as well when selecting a node or edge.</li>
-    <li class="normal notyet">(<a href="https://github.com/almende/vis/issues/685" target="_blank">685</a>) New type of node: Supernode. The supernode could have multiple connection subnodes.</li>
+    <li class="normal">(<a href="https://github.com/almende/vis/issues/685" target="_blank">685</a>) New type of node: Supernode. The supernode could have multiple connection subnodes.</li>
     <li class="normal">(<a href="https://github.com/almende/vis/issues/602" target="_blank">602</a>) Add hoverEdge and blurEdge events.</li>
     <li class="normal">(<a href="https://github.com/almende/vis/issues/528" target="_blank">548</a>) Allow labels to be images too.</li>
-    <li class="normal blue">(<a href="https://github.com/almende/vis/issues/530" target="_blank">530<span>/a>, <a href="https://github.com/almende/vis/issues/475" target="_blank">475<span>/a>, <a href="https://github.com/almende/vis/issues/300" target="_blank">300</a>) Improve option structure for the behaviour of the network. This will solve multiple issues if done correctly.</li>
+    <!--<li class="normal blue">(<a href="https://github.com/almende/vis/issues/530" target="_blank">530</a>, <a href="https://github.com/almende/vis/issues/475" target="_blank">475</a>, <a href="https://github.com/almende/vis/issues/300" target="_blank">300</a>) Improve option structure for the behaviour of the network. This will solve multiple issues if done correctly.</li>-->
     <li class="normal blue">(<a href="https://github.com/almende/vis/issues/528" target="_blank">528</a>) Allow the inserting of a custom sorting function for the hierarchical layout.</li>
     <li class="normal">(<a href="https://github.com/almende/vis/issues/507" target="_blank">507</a>) Add animations to the edges, like circles travelling over them or icons.</li>
-    <li class="normal blue">(<a href="https://github.com/almende/vis/issues/430" target="_blank">430<span>/a>) Add fix/unfix functions for nodes. This can be done with allowToMoveX and Y but native options would be better ('node.disableMove' and 'node.disableDrag').</li>
-    <li class="normal blue">(<a href="https://github.com/almende/vis/issues/351" target="_blank">351<span>an class="p">/a>) Improve the options for arrows, backarrows and linetypes. Possibly receiving a function as input for custom nodes &amp; edges.</li>
-    <li class="normal blue">(<a href="https://github.com/almende/vis/issues/335" target="_blank">335</a>) Set smooth curves per edge.</li>
+    <!--<li class="normal blue">(<a href="https://github.com/almende/vis/issues/430" target="_blank">430</a>) Add fix/unfix functions for nodes. This can be done with allowToMoveX and Y but native options would be better ('node.disableMove' and 'node.disableDrag').</li>-->
+    <!--<li class="normal blue">(<a href="https://github.com/almende/vis/issues/351" target="_blank">351</a>) Improve the options for arrows, backarrows and linetypes. Possibly receiving a function as input for custom nodes &amp; edges.</li>-->
+    <!--<li class="normal blue">(<a href="https://github.com/almende/vis/issues/335" target="_blank">335</a>) Set smooth curves per edge.</li>-->
     <li class="pink">(<a href="https://github.com/almende/vis/issues/323" target="_blank">323</a>) GIF support.</li>
-    <li class="normal blue done">(<a href="https://github.com/almende/vis/issues/247" target="_blank">247</a>) Allow the font-size of a label to depend on the value (thereby the node-size).</li>
-    <li class="normal blue done">(<a href="https://github.com/almende/vis/issues/247" target="_blank">247<span>/a>) Set thresholds for displaying of labels based on the value. As you zoom out, only the most noteworthy labels will be shown.</li>
+    <!--<li class="normal blue done">(<a href="https://github.com/almende/vis/issues/247" target="_blank">247</a>) Allow the font-size of a label to depend on the value (thereby the node-size).</li>-->
+    <!--<li class="normal blue done">(<a href="https://github.com/almende/vis/issues/247" target="_blank">247</a>) Set thresholds for displaying of labels based on the value. As you zoom out, only the most noteworthy labels will be shown.</li>-->
     <li class="normal">(<a href="https://github.com/almende/vis/issues/246" target="_blank">246</a>) Add a fontAlignment option. This option should control where the label is drawn with respect to the node (ie. above, midde, under, left, right etc).</li>
     <li class="normal">(<a href="https://github.com/almende/vis/issues/211" target="_blank">211</a>) Create styling groups for edges, as they already exist for nodes.</li>
-    <li class="normal notyet">(<a href="https://github.com/almende/vis/issues/203" target="_blank">203</a>) Improve the click/doubleClick event with options how these should be fired.</li>
+    <li class="normal">(<a href="https://github.com/almende/vis/issues/203" target="_blank">203</a>) Improve the click/doubleClick event with options how these should be fired.</li>
 </ul>
 <h3 id="timeline">Timeline</h3>
 <ul>
@@ -186,7 +186,7 @@ Legend:
 <ul>
     <li class="normal">(<a href="https://github.com/almende/vis/issues/821" target="_blank">821</a>) Fill between graphs (could fit in with the uncertainty styles).</li>
     <li class="normal">(<a href="https://github.com/almende/vis/issues/681" target="_blank">681</a>) Clickable datapoints, bars etc.</li>
-    <li class="blue">(<a href="https://github.com/almende/vis/issues/516" target="_blank">516</a>) Stacking of line graphs similar to how the bar charts can be stacked.</li>
+    <li class="notyet">(<a href="https://github.com/almende/vis/issues/516" target="_blank">516</a>) Stacking of line graphs similar to how the bar charts can be stacked.</li>
     <li class="normal">(<a href="https://github.com/almende/vis/issues/500" target="_blank">500</a>) Adding a group visibility in legends.</li>
     <li class="normal">(<a href="https://github.com/almende/vis/issues/388" target="_blank">388</a>, <a href="https://github.com/almende/vis/issues/311" target="_blank">311</a>, <a href="https://github.com/almende/vis/issues/282" target="_blank">282</a>) ToolTips: this should give a stylable tooltip with the value at the position of the cursor. Options should include: <ul><li class="normal"><strong>snapToDatapoint</strong> (only show tooltips on datapoints, if off, show interpolated value at position)</li><li class="normal"> <strong>alwaysOn</strong> (always show tooltips on datapoints, perhaps with an optional tag that you can specify here?)</li></ul>
     <li class="normal">(<a href="https://github.com/almende/vis/issues/354" target="_blank">354</a>) Add uncertainty plot styles (box, candle, shaded area, etc.)</li>

index.html

@@ -127,7 +127,7 @@
             <div class="vis-component">
                 <a href="./graph2d_examples.html"><img class="img-thumbnail"  src="./images/graph2d.png" alt="graph2d examples" style="width: 240px; height: 140px;"></a>
                 <h2>Graph2d</h2>
-                <p>Draw graphs and bar charts on an interactive timeline and personalize it any way you want.</p>
+                <p>Draw graphs and bar charts on an interactive timeline and personalize it the way you want.</p>
                 <p><a class="btn btn-default" href="./graph2d_examples.html" role="button">View examples &raquo;</a></p>
                 <p><a class="btn btn-primary" href="./docs/graph2d" role="button">View docs &raquo;</a></p>
             </div>
@@ -188,7 +188,7 @@
                     </p>
                     <h3>download</h3>
                     <p>
-                        <a href="download/vis.zip">vis.zip (version <span class="version">3.12.0</span>)</a>
+                        <a href="download/vis.zip">vis.zip (version <span class="version">4.0.0</span>)</a>
                     </p>
                 </div>
             </div>