highcharts-rails 4.2.3 → 4.2.4

data/app/assets/javascripts/highcharts/highcharts-3d.js

@@ -2,7 +2,7 @@
 // @compilation_level SIMPLE_OPTIMIZATIONS
 
 /**
- * @license Highcharts JS v4.2.3 (2016-02-08)
+ * @license Highcharts JS v4.2.4 (2016-04-14)
  *
  * 3D features for Highcharts JS
  *
@@ -19,7 +19,8 @@
 /**
         Shorthands for often used function
     */
-    var each = Highcharts.each,
+    var animObject = Highcharts.animObject,
+        each = Highcharts.each,
         extend = Highcharts.extend,
         inArray = Highcharts.inArray,
         merge = Highcharts.merge,
@@ -46,7 +47,8 @@
     function perspective(points, chart, insidePlotArea) {
         var options3d = chart.options.chart.options3d,
             inverted = false,
-            origin;
+            origin,
+            scale = chart.scale3d || 1;
 
         if (insidePlotArea) {
             inverted = chart.inverted;
@@ -115,10 +117,12 @@
                 py = py * (vd / (pz + ze + vd));
             }
 
+
             //Apply translation
-            px = px + xe;
-            py = py + ye;
-            pz = pz + ze;
+            px = px * scale + xe;
+            py = py * scale + ye;
+            pz = pz * scale + ze;
+
 
             result.push({
                 x: (inverted ? py : px),
@@ -486,13 +490,9 @@
             delete params.alpha;
             delete params.beta;
 
-            animation = pick(animation, this.renderer.globalAnimation);
+            animation = animObject(pick(animation, this.renderer.globalAnimation));
         
-            if (animation) {
-                if (typeof animation !== 'object') {
-                    animation = {};
-                }
-            
+            if (animation.duration) {
                 params = merge(params); // Don't mutate the original object
                 ca = suckOutCustom(params);
             
@@ -725,6 +725,106 @@
         return this.options.chart.options3d && this.options.chart.options3d.enabled; // #4280
     };
 
+    /**
+     * Extend the getMargins method to calculate scale of the 3D view. That is required to
+     * fit chart's 3D projection into the actual plotting area. Reported as #4933.
+     */
+    Highcharts.wrap(Highcharts.Chart.prototype, 'getMargins', function (proceed) {
+        var chart = this,
+            options3d = chart.options.chart.options3d,
+            bbox3d = {
+                minX: Number.MAX_VALUE,
+                maxX: -Number.MAX_VALUE,
+                minY: Number.MAX_VALUE,
+                maxY: -Number.MAX_VALUE
+            },
+            plotLeft = chart.plotLeft,
+            plotRight = chart.plotWidth + plotLeft,
+            plotTop = chart.plotTop,
+            plotBottom = chart.plotHeight + plotTop,
+            originX = plotLeft + chart.plotWidth / 2,
+            originY = plotTop + chart.plotHeight / 2,
+            scale = 1,
+            corners = [],
+            i;
+
+        proceed.apply(this, [].slice.call(arguments, 1));
+
+        if (this.is3d()) {
+            if (options3d.fitToPlot === true) {
+                // Clear previous scale in case of updates:
+                chart.scale3d = 1;
+
+                // Top left corners:
+                corners = [{
+                    x: plotLeft,
+                    y: plotTop,
+                    z: 0
+                }, {
+                    x: plotLeft,
+                    y: plotTop,
+                    z: options3d.depth
+                }];
+
+                // Top right corners:
+                for (i = 0; i < 2; i++) {
+                    corners.push({
+                        x: plotRight,
+                        y: corners[i].y,
+                        z: corners[i].z
+                    });
+                }
+
+                // All bottom corners:
+                for (i = 0; i < 4; i++) {
+                    corners.push({
+                        x: corners[i].x,
+                        y: plotBottom,
+                        z: corners[i].z
+                    });
+                }
+
+                // Calculate 3D corners:
+                corners = perspective(corners, chart, false);
+
+                // Get bounding box of 3D element:
+                each(corners, function (corner) {
+                    bbox3d.minX = Math.min(bbox3d.minX, corner.x);
+                    bbox3d.maxX = Math.max(bbox3d.maxX, corner.x);
+                    bbox3d.minY = Math.min(bbox3d.minY, corner.y);
+                    bbox3d.maxY = Math.max(bbox3d.maxY, corner.y);
+                });
+
+                // Left edge:
+                if (plotLeft > bbox3d.minX) {
+                    scale = Math.min(scale, 1 - Math.abs((plotLeft + originX) / (bbox3d.minX + originX)) % 1);
+                }
+
+                // Right edge:
+                if (plotRight < bbox3d.maxX) {
+                    scale = Math.min(scale, (plotRight - originX) / (bbox3d.maxX - originX));
+                }
+
+                // Top edge:
+                if (plotTop > bbox3d.minY) {
+                    if (bbox3d.minY < 0) {
+                        scale = Math.min(scale, (plotTop + originY) / (-bbox3d.minY + plotTop + originY));
+                    } else {
+                        scale = Math.min(scale, 1 - (plotTop + originY) / (bbox3d.minY + originY) % 1);
+                    }
+                }
+
+                // Bottom edge:
+                if (plotBottom < bbox3d.maxY) {
+                    scale = Math.min(scale, Math.abs((plotBottom - originY) / (bbox3d.maxY - originY)));
+                }
+
+                // Set scale, used later in perspective method():
+                chart.scale3d = scale;
+            }
+        }
+    });
+
     Highcharts.wrap(Highcharts.Chart.prototype, 'isInsidePlot', function (proceed) {
         return this.is3d() || proceed.apply(this, [].slice.call(arguments, 1));
     });
@@ -735,6 +835,7 @@
         alpha: 0,
         beta: 0,
         depth: 100,
+        fitToPlot: true,
         viewDistance: 25,
         frame: {
             bottom: { size: 1, color: 'rgba(255,255,255,0)' },
@@ -1213,7 +1314,7 @@
                 shapeArgs.insidePlotArea = true;
 
                 // Translate the tooltip position in 3d space
-                tooltipPos = perspective([{ x: tooltipPos[0], y: tooltipPos[1], z: z }], chart, false)[0];
+                tooltipPos = perspective([{ x: tooltipPos[0], y: tooltipPos[1], z: z }], chart, true)[0];
                 point.tooltipPos = [tooltipPos.x, tooltipPos.y];
             }
         });
@@ -1495,7 +1596,7 @@
                 // #4584 Check if has graphic - null points don't have it
                 if (graphic) {
                     // Hide null or 0 points (#3006, 3650)
-                    graphic[point.y ? 'show' : 'hide']();
+                    graphic[point.y && point.visible ? 'show' : 'hide']();
                 }
             });    
         }
@@ -1653,6 +1754,10 @@
             this.axisTypes = ['xAxis', 'yAxis', 'zAxis'];
             this.pointArrayMap = ['x', 'y', 'z'];
             this.parallelArrays = ['x', 'y', 'z'];
+
+            // Require direct touch rather than using the k-d-tree, because the k-d-tree currently doesn't
+            // take the xyz coordinate system into account (#4552)
+            this.directTouch = true;
         }
 
         var result = proceed.apply(this, [chart, options]);

data/app/assets/javascripts/highcharts/highcharts-more.js

@@ -2,7 +2,7 @@
 // @compilation_level SIMPLE_OPTIMIZATIONS
 
 /**
- * @license Highcharts JS v4.2.3 (2016-02-08)
+ * @license Highcharts JS v4.2.4 (2016-04-14)
  *
  * (c) 2009-2016 Torstein Honsi
  *
@@ -24,6 +24,7 @@ var arrayMin = Highcharts.arrayMin,
         map = Highcharts.map,
         pick = Highcharts.pick,
         pInt = Highcharts.pInt,
+        correctFloat = Highcharts.correctFloat,
         defaultPlotOptions = Highcharts.getOptions().plotOptions,
         seriesTypes = Highcharts.seriesTypes,
         extendClass = Highcharts.extendClass,
@@ -971,7 +972,10 @@ var arrayMin = Highcharts.arrayMin,
                 var series = this,
                     yAxis = series.yAxis,
                     xAxis = series.xAxis,
+                    startAngleRad = xAxis.startAngleRad,
+                    start,
                     chart = series.chart,
+                    isRadial = series.xAxis.isRadial,
                     plotHigh;
 
                 colProto.translate.apply(series);
@@ -989,7 +993,7 @@ var arrayMin = Highcharts.arrayMin,
 
                     // adjust shape
                     y = plotHigh;
-                    height = point.plotY - plotHigh;
+                    height = pick(point.rectPlotY, point.plotY) - plotHigh;
 
                     // Adjust for minPointLength
                     if (Math.abs(height) < minPointLength) {
@@ -1003,19 +1007,28 @@ var arrayMin = Highcharts.arrayMin,
                         y -= height;
                     }
 
-                    shapeArgs.height = height;
-                    shapeArgs.y = y;
-
-                    point.tooltipPos = chart.inverted ? 
-                        [ 
-                            yAxis.len + yAxis.pos - chart.plotLeft - y - height / 2, 
-                            xAxis.len + xAxis.pos - chart.plotTop - shapeArgs.x - shapeArgs.width / 2, 
-                            height
-                        ] : [
-                            xAxis.left - chart.plotLeft + shapeArgs.x + shapeArgs.width / 2, 
-                            yAxis.pos - chart.plotTop + y + height / 2, 
-                            height
-                        ]; // don't inherit from column tooltip position - #3372
+                    if (isRadial) {
+
+                        start = point.barX + startAngleRad;
+                        point.shapeType = 'path';
+                        point.shapeArgs = {
+                            d: series.polarArc(y + height, y, start, start + point.pointWidth)
+                        };
+                    } else {
+                        shapeArgs.height = height;
+                        shapeArgs.y = y;
+
+                        point.tooltipPos = chart.inverted ? 
+                            [ 
+                                yAxis.len + yAxis.pos - chart.plotLeft - y - height / 2, 
+                                xAxis.len + xAxis.pos - chart.plotTop - shapeArgs.x - shapeArgs.width / 2, 
+                                height
+                            ] : [
+                                xAxis.left - chart.plotLeft + shapeArgs.x + shapeArgs.width / 2, 
+                                yAxis.pos - chart.plotTop + y + height / 2, 
+                                height
+                            ]; // don't inherit from column tooltip position - #3372
+                    }
                 });
             },
             directTouch: true,
@@ -1025,8 +1038,13 @@ var arrayMin = Highcharts.arrayMin,
             pointAttrToOptions: colProto.pointAttrToOptions,
             drawPoints: colProto.drawPoints,
             drawTracker: colProto.drawTracker,
-            animate: colProto.animate,
-            getColumnMetrics: colProto.getColumnMetrics
+            getColumnMetrics: colProto.getColumnMetrics,
+            animate: function () {
+                return colProto.animate.apply(this, arguments);
+            },
+            polarArc: function () {
+                return colProto.polarArc.apply(this, arguments);
+            }
         });
     }());
 
@@ -1096,6 +1114,7 @@ var arrayMin = Highcharts.arrayMin,
         // chart.angular will be set to true when a gauge series is present, and this will
         // be used on the axes
         angular: true,
+        directTouch: true, // #5063
         drawGraph: noop,
         fixedBox: true,
         forceDL: true,
@@ -1658,9 +1677,9 @@ var arrayMin = Highcharts.arrayMin,
                 // override point value for sums
                 // #3710 Update point does not propagate to sum
                 if (point.isSum) {
-                    point.y = yValue;
+                    point.y = correctFloat(yValue);
                 } else if (point.isIntermediateSum) {
-                    point.y = yValue - previousIntermediate; // #3840
+                    point.y = correctFloat(yValue - previousIntermediate); // #3840
                 }
                 // up points
                 y = mathMax(previousY, previousY + point.y) + range[0];
@@ -1740,9 +1759,9 @@ var arrayMin = Highcharts.arrayMin,
                 point = points && points[i] ? points[i] : {};
 
                 if (y === 'sum' || point.isSum) {
-                    yData[i] = sum;
+                    yData[i] = correctFloat(sum);
                 } else if (y === 'intermediateSum' || point.isIntermediateSum) {
-                    yData[i] = subSum;
+                    yData[i] = correctFloat(subSum);
                 } else {
                     sum += y;
                     subSum += y;
@@ -2194,7 +2213,7 @@ var arrayMin = Highcharts.arrayMin,
 
             if (range > 0) {
                 while (i--) {
-                    if (typeof data[i] === 'number') {
+                    if (typeof data[i] === 'number' && axis.dataMin <= data[i] && data[i] <= axis.dataMax) {
                         radius = series.radii[i];
                         pxMin = Math.min(((data[i] - min) * transA) - radius, pxMin);
                         pxMax = Math.max(((data[i] - min) * transA) + radius, pxMax);
@@ -2529,6 +2548,24 @@ var arrayMin = Highcharts.arrayMin,
         if (seriesTypes.column) {
 
             colProto = seriesTypes.column.prototype;
+
+            colProto.polarArc = function (low, high, start, end) {
+                var center = this.xAxis.center,
+                    len = this.yAxis.len;
+                
+                return this.chart.renderer.symbols.arc(
+                    center[0],
+                    center[1],
+                    len - high,
+                    null,
+                    {
+                        start: start,
+                        end: end,
+                        innerR: len - pick(low, len)
+                    }
+                );
+            };
+
             /**
             * Define the animate method for columnseries
             */
@@ -2541,10 +2578,7 @@ var arrayMin = Highcharts.arrayMin,
             wrap(colProto, 'translate', function (proceed) {
 
                 var xAxis = this.xAxis,
-                    len = this.yAxis.len,
-                    center = xAxis.center,
                     startAngleRad = xAxis.startAngleRad,
-                    renderer = this.chart.renderer,
                     start,
                     points,
                     point,
@@ -2563,23 +2597,11 @@ var arrayMin = Highcharts.arrayMin,
                         point = points[i];
                         start = point.barX + startAngleRad;
                         point.shapeType = 'path';
-                        point.shapeArgs = {
-                            d: renderer.symbols.arc(
-                                center[0],
-                                center[1],
-                                len - point.plotY,
-                                null,
-                                {
-                                    start: start,
-                                    end: start + point.pointWidth,
-                                    innerR: len - pick(point.yBottom, len)
-                                }
-                            )
-                        };
+                        point.shapeArgs = this.polarArc(point.yBottom, point.plotY, start, start + point.pointWidth);
                         // Provide correct plotX, plotY for tooltip
                         this.toXY(point);
                         point.tooltipPos = [point.plotX, point.plotY];
-                        point.ttBelow = point.plotY > center[1];
+                        point.ttBelow = point.plotY > xAxis.center[1];
                     }
                 }
             });

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

@@ -11,7 +11,8 @@
  * - Column range.
  * - Heatmap.
  * - Treemap.
- * - Check how it works with Highstock and data grouping.
+ * - Check how it works with Highstock and data grouping. Currently it only works when navigator.adaptToUpdatedData
+ *   is false. It is also recommended to set scrollbar.liveRedraw to false.
  * - Check inverted charts.
  * - Check reversed axes.
  * - Chart callback should be async after last series is drawn. (But not necessarily, we don't do
@@ -29,7 +30,8 @@
  *
  * Notes for boost mode
  * - Area lines are not drawn
- * - Point markers are not drawn
+ * - Point markers are not drawn on line-type series
+ * - Lines are not drawn on scatter charts
  * - Zones and negativeColor don't work
  * - Columns are always one pixel wide. Don't set the threshold too low.
  *
@@ -64,6 +66,7 @@
         extend = H.extend,
         addEvent = H.addEvent,
         fireEvent = H.fireEvent,
+        grep = H.grep,
         merge = H.merge,
         pick = H.pick,
         wrap = H.wrap,
@@ -160,7 +163,7 @@
 
     H.extend(Series.prototype, {
         pointRange: 0,
-
+        allowDG: false, // No data grouping, let boost handle large data 
         hasExtremes: function (checkX) {
             var options = this.options,
                 data = options.data,
@@ -222,8 +225,8 @@
                 ctx.clearRect(0, 0, width, height);
             }
 
-            this.canvas.setAttribute('width', width);
-            this.canvas.setAttribute('height', height);
+            this.canvas.width = width;
+            this.canvas.height = height;
             this.image.attr({
                 width: width,
                 height: height
@@ -534,7 +537,6 @@
 
     // Rect is twice as fast as arc, should be used for small markers
     seriesTypes.scatter.prototype.cvsMarkerSquare = function (ctx, clientX, plotY, r) {
-        ctx.moveTo(clientX, plotY);
         ctx.rect(clientX - r, plotY - r, r * 2, r * 2);
     };
     seriesTypes.scatter.prototype.fill = true;
@@ -583,6 +585,26 @@
         return point;
     };
 
+    /**
+     * Extend series.destroy to also remove the fake k-d-tree points (#5137). Normally
+     * this is handled by Series.destroy that calls Point.destroy, but the fake
+     * search points are not registered like that.
+     */
+    wrap(Series.prototype, 'destroy', function (proceed) {
+        var series = this,
+            chart = series.chart;
+        if (chart.hoverPoints) {
+            chart.hoverPoints = grep(chart.hoverPoints, function (point) {
+                return point.series === series;
+            });
+        }
+
+        if (chart.hoverPoint && chart.hoverPoint.series === series) {
+            chart.hoverPoint = null;
+        }
+        proceed.call(this);
+    });
+
     /**
      * Return a point instance from the k-d-tree
      */