highcharts-rails 5.0.6 → 5.0.7

data/app/assets/javascripts/highcharts/modules/treemap.js

@@ -1,5 +1,5 @@
 /**
- * @license Highcharts JS v5.0.6 (2016-12-07)
+ * @license Highcharts JS v5.0.7 (2017-01-17)
  *
  * (c) 2014 Highsoft AS
  * Authors: Jon Arild Nygard / Oystein Moseng
@@ -31,6 +31,7 @@
             each = H.each,
             grep = H.grep,
             isNumber = H.isNumber,
+            isString = H.isString,
             pick = H.pick,
             Series = H.Series,
             stableSort = H.stableSort,
@@ -148,44 +149,20 @@
              * Creates a tree structured object from the series points
              */
             getTree: function() {
-                var tree,
-                    series = this,
+                var series = this,
                     allIds = map(this.data, function(d) {
                         return d.id;
                     }),
                     parentList = series.getListOfParents(this.data, allIds);
 
                 series.nodeMap = [];
-                tree = series.buildNode('', -1, 0, parentList, null);
-                // Parents of the root node is by default visible
-                recursive(this.nodeMap[this.rootNode], function(node) {
-                    var next = false,
-                        p = node.parent;
-                    node.visible = true;
-                    if (p || p === '') {
-                        next = series.nodeMap[p];
-                    }
-                    return next;
-                });
-                // Children of the root node is by default visible
-                recursive(this.nodeMap[this.rootNode].children, function(children) {
-                    var next = false;
-                    each(children, function(child) {
-                        child.visible = true;
-                        if (child.children.length) {
-                            next = (next || []).concat(child.children);
-                        }
-                    });
-                    return next;
-                });
-                this.setTreeValues(tree);
-                return tree;
+                return series.buildNode('', -1, 0, parentList, null);
             },
             init: function(chart, options) {
                 var series = this;
                 Series.prototype.init.call(series, chart, options);
                 if (series.options.allowDrillToNode) {
-                    series.drillTo();
+                    H.addEvent(series, 'click', series.onClickDrillToNode);
                 }
             },
             buildNode: function(id, i, level, list, parent) {
@@ -221,6 +198,27 @@
                     children = [],
                     val,
                     point = series.points[tree.i];
+                // Parents of the root node is by default visible
+                recursive(series.nodeMap[series.rootNode], function(node) {
+                    var next = false,
+                        p = node.parent;
+                    node.visible = true;
+                    if (p || p === '') {
+                        next = series.nodeMap[p];
+                    }
+                    return next;
+                });
+                // Children of the root node is by default visible
+                recursive(series.nodeMap[series.rootNode].children, function(children) {
+                    var next = false;
+                    each(children, function(child) {
+                        child.visible = true;
+                        if (child.children.length) {
+                            next = (next || []).concat(child.children);
+                        }
+                    });
+                    return next;
+                });
 
                 // First give the children some values
                 each(tree.children, function(child) {
@@ -319,7 +317,8 @@
                         x2,
                         y1,
                         y2,
-                        crispCorr = 0.5; // Assume 1px borderWidth for simplicity
+                        strokeWidth = series.pointAttribs(point)['stroke-width'] || 0,
+                        crispCorr = (strokeWidth % 2) / 2;
 
                     // Points which is ignored, have no values.
                     if (values && node.visible) {
@@ -563,56 +562,66 @@
                 return this.algorithmFill(false, parent, children);
             },
             translate: function() {
-                var pointValues,
+                var series = this,
+                    rootId = series.rootNode = pick(series.rootNode, series.options.rootId, ''),
+                    rootNode,
+                    pointValues,
                     seriesArea,
                     tree,
                     val;
 
                 // Call prototype function
-                Series.prototype.translate.call(this);
-
-                // Assign variables
-                this.rootNode = pick(this.options.rootId, '');
+                Series.prototype.translate.call(series);
                 // Create a object map from level to options
-                this.levelMap = reduce(this.options.levels, function(arr, item) {
+                series.levelMap = reduce(series.options.levels, function(arr, item) {
                     arr[item.level] = item;
                     return arr;
                 }, {});
-                tree = this.tree = this.getTree(); // @todo Only if series.isDirtyData is true
+                tree = series.tree = series.getTree(); // @todo Only if series.isDirtyData is true
+                rootNode = series.nodeMap[rootId];
+                if (
+                    rootId !== '' &&
+                    (!rootNode || !rootNode.children.length)
+                ) {
+                    series.drillToNode('', false);
+                    rootId = series.rootNode;
+                    rootNode = series.nodeMap[rootId];
+                }
+                series.setTreeValues(tree);
 
                 // Calculate plotting values.
-                this.axisRatio = (this.xAxis.len / this.yAxis.len);
-                this.nodeMap[''].pointValues = pointValues = {
+                series.axisRatio = (series.xAxis.len / series.yAxis.len);
+                series.nodeMap[''].pointValues = pointValues = {
                     x: 0,
                     y: 0,
                     width: 100,
                     height: 100
                 };
-                this.nodeMap[''].values = seriesArea = merge(pointValues, {
-                    width: (pointValues.width * this.axisRatio),
-                    direction: (this.options.layoutStartingDirection === 'vertical' ? 0 : 1),
+                series.nodeMap[''].values = seriesArea = merge(pointValues, {
+                    width: (pointValues.width * series.axisRatio),
+                    direction: (series.options.layoutStartingDirection === 'vertical' ? 0 : 1),
                     val: tree.val
                 });
-                this.calculateChildrenAreas(tree, seriesArea);
+                series.calculateChildrenAreas(tree, seriesArea);
 
                 // Logic for point colors
-                if (this.colorAxis) {
-                    this.translateColors();
-                } else if (!this.options.colorByPoint) {
-                    this.setColorRecursive(this.tree);
+                if (series.colorAxis) {
+                    series.translateColors();
+                } else if (!series.options.colorByPoint) {
+                    series.setColorRecursive(series.tree);
                 }
 
                 // Update axis extremes according to the root node.
-                if (this.options.allowDrillToNode) {
-                    val = this.nodeMap[this.rootNode].pointValues;
-                    this.xAxis.setExtremes(val.x, val.x + val.width, false);
-                    this.yAxis.setExtremes(val.y, val.y + val.height, false);
-                    this.xAxis.setScale();
-                    this.yAxis.setScale();
+                if (series.options.allowDrillToNode) {
+                    val = rootNode.pointValues;
+                    series.xAxis.setExtremes(val.x, val.x + val.width, false);
+                    series.yAxis.setExtremes(val.y, val.y + val.height, false);
+                    series.xAxis.setScale();
+                    series.yAxis.setScale();
                 }
 
                 // Assign values to points.
-                this.setPointValues();
+                series.setPointValues();
             },
             /**
              * Extend drawDataLabels with logic to handle custom options related to the treemap series:
@@ -752,20 +761,15 @@
             /**
              * Add drilling on the suitable points
              */
-            drillTo: function() {
-                var series = this;
-                H.addEvent(series, 'click', function(event) {
-                    var point = event.point,
-                        drillId = point.drillId,
-                        drillName;
-                    // If a drill id is returned, add click event and cursor. 
-                    if (drillId) {
-                        drillName = series.nodeMap[series.rootNode].name || series.rootNode;
-                        point.setState(''); // Remove hover
-                        series.drillToNode(drillId);
-                        series.showDrillUpButton(drillName);
-                    }
-                });
+            onClickDrillToNode: function(event) {
+                var series = this,
+                    point = event.point,
+                    drillId = point && point.drillId;
+                // If a drill id is returned, add click event and cursor. 
+                if (isString(drillId)) {
+                    point.setState(''); // Remove hover
+                    series.drillToNode(drillId);
+                }
             },
             /**
              * Finds the drill id for a parent node.
@@ -803,32 +807,26 @@
                 return drillId;
             },
             drillUp: function() {
-                var drillPoint = null,
-                    node,
-                    parent;
-                if (this.rootNode) {
-                    node = this.nodeMap[this.rootNode];
-                    if (node.parent !== null) {
-                        drillPoint = this.nodeMap[node.parent];
-                    } else {
-                        drillPoint = this.nodeMap[''];
-                    }
-                }
-
-                if (drillPoint !== null) {
-                    this.drillToNode(drillPoint.id);
-                    if (drillPoint.id === '') {
-                        this.drillUpButton = this.drillUpButton.destroy();
-                    } else {
-                        parent = this.nodeMap[drillPoint.parent];
-                        this.showDrillUpButton((parent.name || parent.id));
-                    }
+                var series = this,
+                    node = series.nodeMap[series.rootNode];
+                if (node && isString(node.parent)) {
+                    series.drillToNode(node.parent);
                 }
             },
-            drillToNode: function(id) {
-                this.options.rootId = id;
+            drillToNode: function(id, redraw) {
+                var series = this,
+                    nodeMap = series.nodeMap,
+                    node = nodeMap[id];
+                series.rootNode = id;
+                if (id === '') {
+                    series.drillUpButton = series.drillUpButton.destroy();
+                } else {
+                    series.showDrillUpButton((node && node.name || id));
+                }
                 this.isDirty = true; // Force redraw
-                this.chart.redraw();
+                if (pick(redraw, true)) {
+                    this.chart.redraw();
+                }
             },
             showDrillUpButton: function(name) {
                 var series = this,

data/app/assets/javascripts/highcharts/modules/xrange-series.js

@@ -1,5 +1,5 @@
 /**
- * @license Highcharts JS v5.0.6 (2016-12-07)
+ * @license Highcharts JS v5.0.7 (2017-01-17)
  * X-range series
  *
  * (c) 2010-2016 Torstein Honsi, Lars A. V. Cabrera
@@ -135,6 +135,10 @@
                     plotX = Math.max(plotX, -10);
                     plotX2 = Math.min(Math.max(plotX2, -10), xAxis.len + 10);
 
+                    if (plotX2 < plotX) { // #6107
+                        plotX2 = plotX;
+                    }
+
                     point.shapeArgs = {
                         x: plotX,
                         y: point.plotY + metrics.offset,

data/lib/highcharts/version.rb

@@ -1,3 +1,3 @@
 module Highcharts
-  VERSION = "5.0.6"
+  VERSION = "5.0.7"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: highcharts-rails
 version: !ruby/object:Gem::Version
-  version: 5.0.6
+  version: 5.0.7
 platform: ruby
 authors:
 - Per Christian B. Viken
@@ -89,6 +89,7 @@ files:
 - app/assets/javascripts/highcharts/modules/overlapping-datalabels.js
 - app/assets/javascripts/highcharts/modules/series-label.js
 - app/assets/javascripts/highcharts/modules/solid-gauge.js
+- app/assets/javascripts/highcharts/modules/stock.js
 - app/assets/javascripts/highcharts/modules/treemap.js
 - app/assets/javascripts/highcharts/modules/xrange-series.js
 - app/assets/javascripts/highcharts/themes/dark-blue.js