highcharts-rails 6.0.2 → 6.0.3

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

@@ -1,5 +1,5 @@
 /**
- * @license  Highcharts JS v6.0.2 (2017-10-20)
+ * @license  Highcharts JS v6.0.3 (2017-11-14)
  * Streamgraph module
  *
  * (c) 2010-2017 Torstein Honsi

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

@@ -1,5 +1,5 @@
 /**
- * @license Highcharts JS v6.0.2 (2017-10-20)
+ * @license Highcharts JS v6.0.3 (2017-11-14)
  *
  * (c) 2016 Highsoft AS
  * Authors: Jon Arild Nygard
@@ -128,6 +128,9 @@
                     }
                 });
             }
+            if (graphic) {
+                graphic.addClass(point.getClassName(), true);
+            }
         };
         return draw;
     }());
@@ -209,6 +212,7 @@
                 point,
                 level,
                 colorByPoint,
+                colorIndexByPoint,
                 color,
                 colorIndex;
 
@@ -236,9 +240,14 @@
                         !!series.options.colorByPoint
                     )
                 );
+
                 if (getColorByPoint) {
-                    colorByPoint = colors[(point.index % colors.length)];
+                    colorIndexByPoint = point.index %
+                        (colors ? colors.length : series.chart.options.chart.colorCount);
+                    colorByPoint = colors && colors[colorIndexByPoint];
                 }
+
+
                 // Select either point color, level color or inherited color.
                 color = pick(
                     point && point.options.color,
@@ -247,9 +256,11 @@
                     parentColor && variation(parentColor),
                     series.color
                 );
+
                 colorIndex = pick(
                     point && point.options.colorIndex,
                     level && level.colorIndex,
+                    colorIndexByPoint,
                     parentColorIndex,
                     options.colorIndex
                 );
@@ -1896,51 +1907,6 @@
             };
         };
 
-        var setShapeArgs = function setShapeArgs(parent, parentValues) {
-            var childrenValues = [],
-                // Collect all children which should be included
-                children = grep(parent.children, function(n) {
-                    return n.visible;
-                });
-            childrenValues = layoutAlgorithm(parentValues, children);
-            each(children, function(child, index) {
-                var values = childrenValues[index],
-                    angle = values.start + ((values.end - values.start) / 2),
-                    radius = values.innerR + ((values.r - values.innerR) / 2),
-                    isCircle = (
-                        values.innerR === 0 &&
-                        (values.end - values.start) > 6.28
-                    ),
-                    center = (
-                        isCircle ? {
-                            x: values.x,
-                            y: values.y
-                        } :
-                        getEndPoint(values.x, values.y, angle, radius)
-                    ),
-                    val = (
-                        child.val ?
-                        (
-                            child.childrenTotal > child.val ?
-                            child.childrenTotal :
-                            child.val
-                        ) :
-                        child.childrenTotal
-                    );
-                child.shapeArgs = merge(values, {
-                    plotX: center.x,
-                    plotY: center.y
-                });
-                child.values = merge(values, {
-                    val: val
-                });
-                // If node has children, then call method recursively
-                if (child.children.length) {
-                    setShapeArgs(child, child.values);
-                }
-            });
-        };
-
         var getDrillId = function getDrillId(point, idRoot, mapIdToNode) {
             var drillId,
                 node = point.node,
@@ -2185,7 +2151,6 @@
                         level = levelMap[node.levelDynamic],
                         shapeExisting = point.shapeExisting || {},
                         shape = node.shapeArgs || {},
-                        attrStyle = series.pointAttribs(point, point.selected && 'select'),
                         animationInfo,
                         onComplete,
                         visible = !!(node.visible && node.shapeArgs);
@@ -2231,7 +2196,13 @@
                     }
                     point.draw({
                         animate: animationInfo.to,
-                        attr: extend(animationInfo.from, attrStyle),
+                        attr: extend(
+                            animationInfo.from,
+                            series.pointAttribs && series.pointAttribs(
+                                point,
+                                point.selected && 'select'
+                            )
+                        ),
                         onComplete: onComplete,
                         group: group,
                         renderer: renderer,
@@ -2255,7 +2226,68 @@
                     Series.prototype.drawDataLabels.call(series);
                 }
             },
+
             pointAttribs: seriesTypes.column.prototype.pointAttribs,
+
+
+            /*
+             * Set the shape arguments on the nodes. Recursive from root down.
+             */
+            setShapeArgs: function(parent, parentValues) {
+                var childrenValues = [],
+                    // Collect all children which should be included
+                    children = grep(parent.children, function(n) {
+                        return n.visible;
+                    });
+                childrenValues = layoutAlgorithm(parentValues, children);
+                each(children, function(child, index) {
+                    var values = childrenValues[index],
+                        angle = values.start + ((values.end - values.start) / 2),
+                        radius = values.innerR + ((values.r - values.innerR) / 2),
+                        isCircle = (
+                            values.innerR === 0 &&
+                            (values.end - values.start) > 6.28
+                        ),
+                        center = (
+                            isCircle ? {
+                                x: values.x,
+                                y: values.y
+                            } :
+                            getEndPoint(values.x, values.y, angle, radius)
+                        ),
+                        val = (
+                            child.val ?
+                            (
+                                child.childrenTotal > child.val ?
+                                child.childrenTotal :
+                                child.val
+                            ) :
+                            child.childrenTotal
+                        ),
+                        innerArcFraction = (values.end - values.start) / (2 * Math.PI),
+                        perimeter = 2 * Math.PI * values.innerR;
+
+                    // The inner arc length is a convenience for data label filters.
+                    if (this.points[child.i]) {
+                        this.points[child.i].innerArcLength =
+                            innerArcFraction * perimeter;
+                    }
+
+                    child.shapeArgs = merge(values, {
+                        plotX: center.x,
+                        plotY: center.y
+                    });
+                    child.values = merge(values, {
+                        val: val
+                    });
+                    // If node has children, then call method recursively
+                    if (child.children.length) {
+                        this.setShapeArgs(child, child.values);
+                    }
+                }, this);
+            },
+
+
             translate: function translate() {
                 var series = this,
                     options = series.options,
@@ -2309,7 +2341,7 @@
                     x: positions[0],
                     y: positions[1]
                 };
-                setShapeArgs(nodeTop, values);
+                this.setShapeArgs(nodeTop, values);
             },
 
             /**

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

@@ -1,5 +1,5 @@
 /**
- * @license  Highcharts JS v6.0.2 (2017-10-20)
+ * @license  Highcharts JS v6.0.3 (2017-11-14)
  * Tilemap module
  *
  * (c) 2010-2017 Highsoft AS

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

@@ -1,5 +1,5 @@
 /**
- * @license Highcharts JS v6.0.2 (2017-10-20)
+ * @license Highcharts JS v6.0.3 (2017-11-14)
  *
  * (c) 2014 Highsoft AS
  * Authors: Jon Arild Nygard / Oystein Moseng
@@ -92,6 +92,7 @@
                 point,
                 level,
                 colorByPoint,
+                colorIndexByPoint,
                 color,
                 colorIndex;
 
@@ -119,9 +120,14 @@
                         !!series.options.colorByPoint
                     )
                 );
+
                 if (getColorByPoint) {
-                    colorByPoint = colors[(point.index % colors.length)];
+                    colorIndexByPoint = point.index %
+                        (colors ? colors.length : series.chart.options.chart.colorCount);
+                    colorByPoint = colors && colors[colorIndexByPoint];
                 }
+
+
                 // Select either point color, level color or inherited color.
                 color = pick(
                     point && point.options.color,
@@ -130,9 +136,11 @@
                     parentColor && variation(parentColor),
                     series.color
                 );
+
                 colorIndex = pick(
                     point && point.options.colorIndex,
                     level && level.colorIndex,
+                    colorIndexByPoint,
                     parentColorIndex,
                     options.colorIndex
                 );

data/app/assets/javascripts/highcharts/modules/variable-pie.js

@@ -1,5 +1,5 @@
 /**
- * @license  Highcharts JS v6.0.2 (2017-10-20)
+ * @license  Highcharts JS v6.0.3 (2017-11-14)
  *
  * Variable Pie module for Highcharts
  *

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

@@ -1,5 +1,5 @@
 /**
- * @license  Highcharts JS v6.0.2 (2017-10-20)
+ * @license  Highcharts JS v6.0.3 (2017-11-14)
  * Highcharts variwide module
  *
  * (c) 2010-2017 Torstein Honsi

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

@@ -1,5 +1,5 @@
 /**
- * @license  Highcharts JS v6.0.2 (2017-10-20)
+ * @license  Highcharts JS v6.0.3 (2017-11-14)
  * Vector plot series module
  *
  * (c) 2010-2017 Torstein Honsi

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

@@ -1,5 +1,5 @@
 /**
- * @license  Highcharts JS v6.0.2 (2017-10-20)
+ * @license  Highcharts JS v6.0.3 (2017-11-14)
  * Wind barb series module
  *
  * (c) 2010-2017 Torstein Honsi

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

@@ -1,5 +1,5 @@
 /**
- * @license Highcharts JS v6.0.2 (2017-10-20)
+ * @license Highcharts JS v6.0.3 (2017-11-14)
  *
  * (c) 2016 Highsoft AS
  * Authors: Jon Arild Nygard
@@ -51,6 +51,9 @@
                     }
                 });
             }
+            if (graphic) {
+                graphic.addClass(point.getClassName(), true);
+            }
         };
         return draw;
     }());
@@ -468,7 +471,8 @@
                 fontFamily: 'Impact, sans-serif'
             },
             tooltip: {
-                followPointer: true
+                followPointer: true,
+                pointFormat: '<span style="color:{point.color}">\u25CF</span> {series.name}: <b>{point.weight}</b><br/>'
             }
         };
 
@@ -530,7 +534,7 @@
                 each(data, function(point) {
                     var relativeWeight = 1 / maxWeight * point.weight,
                         css = extend({
-                            fontSize: series.deriveFontSize(relativeWeight),
+                            fontSize: series.deriveFontSize(relativeWeight) + 'px',
                             fill: point.color
                         }, options.style),
                         placement = placementStrategy(point, {

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

@@ -1,5 +1,5 @@
 /**
- * @license Highcharts JS v6.0.2 (2017-10-20)
+ * @license Highcharts JS v6.0.3 (2017-11-14)
  * X-range series
  *
  * (c) 2010-2017 Torstein Honsi, Lars A. V. Cabrera
@@ -93,7 +93,8 @@
                 headerFormat: '<span style="font-size: 0.85em">{point.x} - {point.x2}</span><br/>',
                 pointFormat: '<span style="color:{point.color}">\u25CF</span> {series.name}: <b>{point.yCategory}</b><br/>'
             },
-            borderRadius: 3
+            borderRadius: 3,
+            pointRange: 0
             /**
              * A partial fill for each point, typically used to visualize how much of
              * a task is performed. The partial fill object can be set either on series
@@ -116,7 +117,6 @@
 
         }, {
             type: 'xrange',
-            forceDL: true,
             parallelArrays: ['x', 'x2', 'y'],
             requireSorting: false,
             animate: seriesTypes.line.prototype.animate,
@@ -178,7 +178,10 @@
                     partialFill,
                     inverted = this.chart.inverted,
                     borderWidth = pick(series.options.borderWidth, 1),
-                    crisper = borderWidth % 2 / 2;
+                    crisper = borderWidth % 2 / 2,
+                    dlLeft,
+                    dlRight,
+                    dlWidth;
 
                 if (minPointLength) {
                     widthDifference = minPointLength - length;
@@ -200,6 +203,23 @@
                     r: series.options.borderRadius
                 };
 
+                // Align data labels inside the shape and inside the plot area
+                dlLeft = point.shapeArgs.x;
+                dlRight = dlLeft + point.shapeArgs.width;
+                if (dlLeft < 0 || dlRight > xAxis.len) {
+                    dlLeft = Math.min(xAxis.len, Math.max(0, dlLeft));
+                    dlRight = Math.max(0, Math.min(dlRight, xAxis.len));
+                    dlWidth = dlRight - dlLeft;
+                    point.dlBox = merge(point.shapeArgs, {
+                        x: dlLeft,
+                        width: dlRight - dlLeft,
+                        centerX: dlWidth ? dlWidth / 2 : null
+                    });
+
+                } else {
+                    point.dlBox = null;
+                }
+
                 // Tooltip position
                 point.tooltipPos[0] += inverted ? 0 : length / 2;
                 point.tooltipPos[1] -= inverted ? length / 2 : metrics.width / 2;
@@ -239,78 +259,6 @@
                 }, this);
             },
 
-            /**
-             * Aligns an individual dataLabel.
-             *
-             * TODO: Do we need this for inside datalabels? Seems to work.
-             *
-             * @param  {Object} point     the point belonging to the dataLabel
-             * @param  {Object} dataLabel the dataLabel configuration object
-             * @param  {Object} options   dataLabel options for the series
-             * @param  {Object} alignTo
-             * @param  {Boolean} isNew   Wheter the label is new or already existed
-             * @return {void}
-             * /
-            alignDataLabel: function (point, dataLabel, options, alignTo, isNew) {
-            	var chart = this.chart,
-            		align = options.align,
-            		inverted = chart.inverted,
-            		plotX = pick(point.plotX, -9999),
-            		plotY = pick(point.plotY, -9999),
-            		verticalAlign = options.verticalAlign,
-            		inside = options.inside,
-            		pointBox = point.shapeArgs,
-            		labelBox = dataLabel.getBBox(),
-            		labelTextBox = dataLabel.text.getBBox(),
-            		attr = {},
-            		visible =
-            			this.visible &&
-            			(
-            				labelTextBox.width <= pointBox.width &&
-            				labelTextBox.height <= pointBox.height
-            			) &&
-            			(
-            				this.forceDL ||
-            				chart.isInsidePlot(plotX, Math.round(plotY), inverted)
-            			);
-
-            	if (visible) {
-            		if (align === 'right') {
-            			if (inside) {
-            				attr.x = pointBox.x + pointBox.width - labelBox.width;
-            			} else {
-            				attr.x = pointBox.x - labelBox.width;
-            			}
-            		} else if (align === 'left') {
-            			if (inside) {
-            				attr.x = pointBox.x;
-            			} else {
-            				attr.x = pointBox.x + pointBox.width + labelBox.x;
-            			}
-            		} else { // Center
-            			attr.x = pointBox.x + pointBox.width / 2 - labelBox.width / 2;
-            		}
-
-            		if (verticalAlign === 'bottom') {
-            			if (inside) {
-            				attr.y = pointBox.y + pointBox.height - labelBox.height;
-            			} else {
-            				attr.y = pointBox.y - labelBox.height;
-            			}
-            		} else if (verticalAlign === 'top') {
-            			if (inside) {
-            				attr.y = pointBox.y;
-            			} else {
-            				attr.y = pointBox.y + pointBox.height;
-            			}
-            		} else { // Middle
-            			attr.y = pointBox.y + pointBox.height / 2 - labelBox.height / 2;
-            		}
-
-            		dataLabel[isNew ? 'attr' : 'animate'](attr);
-            	}
-            },
-            */
             /**
              * Draws a single point in the series. Needed for partial fill.
              *