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

HISTORY.md

@@ -19,6 +19,7 @@ http://visjs.org
 - Added `alignZeros` option to dataAxis with default value true.
 - Fixed bug with points drawn on bargraphs
 - Fixed docs
+- Fixed height increase on scolling if only graphHeight is defined.
 
 
 ### Network

lib/timeline/component/LineGraph.js

@@ -605,6 +605,7 @@ LineGraph.prototype._updateGraph = function () {
         this.options.graphHeight = this.body.domProps.centerContainer.height + 'px';
         this.svg.style.height = this.body.domProps.centerContainer.height + 'px';
       }
+      this.autoSizeSVG = false;
     }
 
     // getting group Ids

lib/timeline/component/graph2d_types/bar.js

@@ -114,7 +114,7 @@ Bargraph.draw = function (groupIds, processedGroupData, framework) {
     DOMutil.drawBar(combinedData[i].x + drawData.offset, combinedData[i].y - heightOffset, drawData.width, group.zeroPosition - combinedData[i].y, group.className + ' bar', framework.svgElements, framework.svg);
     // draw points
     if (group.options.drawPoints.enabled == true) {
-      Points.draw(combinedData, group, framework, drawData.offset);
+      DOMutil.drawPoint(combinedData[i].x + drawData.offset, combinedData[i].y, group, framework.svgElements, framework.svg);
     }
   }
 };