highcharts-rails 5.0.0 → 5.0.3

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

@@ -1,5 +1,5 @@
 /**
- * @license Highcharts JS v5.0.0 (2016-09-29)
+ * @license Highcharts JS v5.0.3 (2016-11-18)
  *
  * 3D features for Highcharts JS
  *
@@ -115,6 +115,25 @@
             });
         };
 
+        /**
+         * Calculate a distance from camera to points - made for calculating zIndex of scatter points.
+         * Parameters:
+         *		- coordinates: The coordinates of the specific point
+         *		- chart: the chart
+         * Returns:
+         *		- a distance from camera to point
+         */
+        H.pointCameraDistance = function(coordinates, chart) {
+            var options3d = chart.options.chart.options3d,
+                cameraPosition = {
+                    x: chart.plotWidth / 2,
+                    y: chart.plotHeight / 2,
+                    z: pick(options3d.depth, 1) * pick(options3d.viewDistance, 0) + options3d.depth
+                },
+                distance = Math.sqrt(Math.pow(cameraPosition.x - coordinates.plotX, 2) + Math.pow(cameraPosition.y - coordinates.plotY, 2) + Math.pow(cameraPosition.z - coordinates.plotZ, 2));
+            return distance;
+        };
+
     }(Highcharts));
     (function(H) {
         /**
@@ -605,6 +624,7 @@
                 if (anim.duration) {
                     params = merge(params); // Don't mutate the original object
                     ca = suckOutCustom(params);
+                    params.dummy = 1; // Params need to have a property in order for the step to run (#5765)
 
                     if (ca) {
                         to = ca;
@@ -612,14 +632,17 @@
                             function interpolate(key) {
                                 return from[key] + (pick(to[key], from[key]) - from[key]) * fx.pos;
                             }
-                            fx.elem.setPaths(merge(from, {
-                                x: interpolate('x'),
-                                y: interpolate('y'),
-                                r: interpolate('r'),
-                                innerR: interpolate('innerR'),
-                                start: interpolate('start'),
-                                end: interpolate('end')
-                            }));
+
+                            if (fx.prop === 'dummy') {
+                                fx.elem.setPaths(merge(from, {
+                                    x: interpolate('x'),
+                                    y: interpolate('y'),
+                                    r: interpolate('r'),
+                                    innerR: interpolate('innerR'),
+                                    start: interpolate('start'),
+                                    end: interpolate('end')
+                                }));
+                            }
                         };
                     }
                     animation = anim; // Only when duration (#5572)
@@ -1987,11 +2010,11 @@
                 rawPoint.plotY = projectedPoint.y;
                 rawPoint.plotZ = projectedPoint.z;
 
-
             }
 
         });
 
+
         wrap(seriesTypes.scatter.prototype, 'init', function(proceed, chart, options) {
             if (chart.is3d()) {
                 // add a third coordinate
@@ -2018,6 +2041,17 @@
             return result;
         });
 
+        /**
+         * Updating zIndex for every point - based on the distance from point to camera
+         */
+        wrap(seriesTypes.scatter.prototype, 'pointAttribs', function(proceed, point) {
+            var pointOptions = proceed.apply(this, [].slice.call(arguments, 1));
+            if (point) {
+                pointOptions.zIndex = H.pointCameraDistance(point, this.chart);
+            }
+            return pointOptions;
+        });
+
     }(Highcharts));
     (function(H) {
         /**

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

@@ -1,5 +1,5 @@
 /**
- * @license Highcharts JS v5.0.0 (2016-09-29)
+ * @license Highcharts JS v5.0.3 (2016-11-18)
  *
  * (c) 2009-2016 Torstein Honsi
  *
@@ -775,7 +775,8 @@
              */
             translate: function() {
                 var series = this,
-                    yAxis = series.yAxis;
+                    yAxis = series.yAxis,
+                    hasModifyValue = !!series.modifyValue;
 
                 seriesTypes.area.prototype.translate.apply(series);
 
@@ -790,7 +791,16 @@
                         point.isNull = true;
                     } else {
                         point.plotLow = plotY;
-                        point.plotHigh = yAxis.translate(high, 0, 1, 0, 1);
+                        point.plotHigh = yAxis.translate(
+                            hasModifyValue ? series.modifyValue(high, point) : high,
+                            0,
+                            1,
+                            0,
+                            1
+                        );
+                        if (hasModifyValue) {
+                            point.yBottom = point.plotHigh;
+                        }
                     }
                 });
 
@@ -1012,8 +1022,10 @@
          * License: www.highcharts.com/license
          */
         'use strict';
+
         var seriesType = H.seriesType,
             seriesTypes = H.seriesTypes;
+
         /**
          * The areasplinerange series type
          */
@@ -1408,9 +1420,12 @@
             seriesType = H.seriesType,
             seriesTypes = H.seriesTypes;
 
-        /* ****************************************************************************
-         * Start Box plot series code											      *
-         *****************************************************************************/
+        /**
+         * The boxplot series type.
+         *
+         * @constructor seriesTypes.boxplot
+         * @augments seriesTypes.column
+         */
         seriesType('boxplot', 'column', {
             threshold: null,
             tooltip: {
@@ -1442,8 +1457,7 @@
             whiskerWidth: 2
 
 
-            // Prototype members
-        }, {
+        }, /** @lends seriesTypes.boxplot */ {
             pointArrayMap: ['low', 'q1', 'median', 'q3', 'high'], // array point configs are mapped to this
             toYData: function(point) { // return a plain array for speedy calculation
                 return [point.low, point.q1, point.median, point.q3, point.high];
@@ -1459,7 +1473,7 @@
                     color = (point && point.color) || this.color;
 
                 return {
-                    'fill': options.fillColor || color,
+                    'fill': point.fillColor || options.fillColor || color,
                     'stroke': options.lineColor || color,
                     'stroke-width': options.lineWidth || 0
                 };
@@ -2196,6 +2210,7 @@
             trackerGroups: ['group', 'dataLabelsGroup'],
             bubblePadding: true,
             zoneAxis: 'z',
+            markerAttribs: null,
 
 
             pointAttribs: function(point, state) {
@@ -2359,8 +2374,11 @@
 
             // Point class
         }, {
-            haloPath: function() {
-                return Point.prototype.haloPath.call(this, this.shapeArgs.r + this.series.options.states.hover.halo.size);
+            haloPath: function(size) {
+                return Point.prototype.haloPath.call(
+                    this,
+                    this.shapeArgs.r + size
+                );
             },
             ttBelow: false
         });
@@ -2414,7 +2432,9 @@
 
                         });
                         series.minPxSize = extremes.minSize;
-                        series.maxPxSize = extremes.maxSize;
+                        // Prioritize min size if conflict to make sure bubbles are
+                        // always visible. #5873
+                        series.maxPxSize = Math.max(extremes.maxSize, extremes.minSize);
 
                         // Find the min and max Z
                         zData = series.zData;

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

@@ -1,5 +1,5 @@
 /**
- * @license Highcharts JS v5.0.0 (2016-09-29)
+ * @license Highcharts JS v5.0.3 (2016-11-18)
  * Accessibility module
  *
  * (c) 2010-2016 Highsoft AS
@@ -117,7 +117,7 @@
         // Put accessible info on series and points of a series
         H.Series.prototype.setA11yDescription = function() {
             var a11yOptions = this.chart.options.accessibility,
-                firstPointEl = this.points && this.points[0].graphic && this.points[0].graphic.element,
+                firstPointEl = this.points && this.points.length && this.points[0].graphic && this.points[0].graphic.element,
                 seriesEl = firstPointEl && firstPointEl.parentNode || this.graph && this.graph.element || this.group && this.group.element; // Could be tracker series depending on series type
 
             if (seriesEl) {
@@ -340,6 +340,7 @@
         H.Chart.prototype.highlightAdjacentPoint = function(next) {
             var series = this.series,
                 curPoint = this.highlightedPoint,
+                curPointIndex = curPoint && curPoint.index || 0,
                 newSeries,
                 newPoint;
 
@@ -353,13 +354,19 @@
                 return series[0].points[0].highlight();
             }
 
+            // Find index of current point in series.points array. Necessary for dataGrouping (and maybe zoom?)
+            if (curPoint.series.points[curPointIndex] !== curPoint) {
+                for (var i = 0; i < curPoint.series.points.length; ++i) {
+                    if (curPoint.series.points[i] === curPoint) {
+                        curPointIndex = i;
+                        break;
+                    }
+                }
+            }
+
+            // Try to grab next/prev point
             newSeries = series[curPoint.series.index + (next ? 1 : -1)];
-            newPoint = next ?
-                // Try to grab next point
-                curPoint.series.points[curPoint.index + 1] || newSeries && newSeries.points[0] :
-                // Try to grab previous point
-                curPoint.series.points[curPoint.index - 1] ||
-                newSeries && newSeries.points[newSeries.points.length - 1];
+            newPoint = curPoint.series.points[curPointIndex + (next ? 1 : -1)] || newSeries && newSeries.points[next ? 0 : newSeries.points.length - 1];
 
             // If there is no adjacent point, we return false
             if (newPoint === undefined) {
@@ -425,6 +432,23 @@
             return false;
         };
 
+        // Highlight legend item by index
+        H.Chart.prototype.highlightLegendItem = function(ix) {
+            var items = this.legend.allItems;
+            if (items[this.highlightedLegendItemIx]) {
+                fireEvent(items[this.highlightedLegendItemIx].legendGroup.element, 'mouseout');
+            }
+            this.highlightedLegendItemIx = ix;
+            if (items[ix]) {
+                if (items[ix].legendGroup.element.focus) {
+                    items[ix].legendGroup.element.focus();
+                }
+                fireEvent(items[ix].legendGroup.element, 'mouseover');
+                return true;
+            }
+            return false;
+        };
+
         // Hide export menu
         H.Chart.prototype.hideExportMenu = function() {
             var exportList = this.exportDivElements;
@@ -773,25 +797,56 @@
                 ], {
                     // Only run if we have range selector with input boxes
                     validate: function() {
-                        return chart.rangeSelector && chart.options.rangeSelector.inputEnabled !== false && chart.rangeSelector.minInput && chart.rangeSelector.maxInput;
+                        var inputVisible = chart.rangeSelector && chart.rangeSelector.inputGroup && chart.rangeSelector.inputGroup.element.getAttribute('visibility') !== 'hidden';
+                        return inputVisible && chart.options.rangeSelector.inputEnabled !== false && chart.rangeSelector.minInput && chart.rangeSelector.maxInput;
                     },
 
                     // Handle tabs different from left/right (because we don't want to catch left/right in a text area)
                     transformTabs: false,
 
-                    // Make boxes focusable by script, and accessible
+                    // Highlight first/last input box
                     init: function(direction) {
-                        each(['minInput', 'maxInput'], function(key, i) {
-                            if (chart.rangeSelector[key]) {
-                                chart.rangeSelector[key].setAttribute('tabindex', '-1');
-                                chart.rangeSelector[key].setAttribute('role', 'textbox');
-                                chart.rangeSelector[key].setAttribute('aria-label', 'Select ' + (i ? 'end' : 'start') + ' date.');
-                            }
-                        });
-                        // Highlight first/last input box
                         chart.highlightedInputRangeIx = direction > 0 ? 0 : 1;
                         chart.rangeSelector[chart.highlightedInputRangeIx ? 'maxInput' : 'minInput'].focus();
                     }
+                }),
+
+                // Legend navigation
+                navModuleFactory([
+                    // Left/Right/Up/Down
+                    [
+                        [37, 39, 38, 40],
+                        function(keyCode) {
+                            var direction = (keyCode === 37 || keyCode === 38) ? -1 : 1;
+                            // Try to highlight next/prev legend item
+                            if (!chart.highlightLegendItem(chart.highlightedLegendItemIx + direction)) {
+                                return this.move(direction);
+                            }
+                        }
+                    ],
+                    // Enter/Spacebar
+                    [
+                        [13, 32],
+                        function() {
+                            fakeClickEvent(chart.legend.allItems[chart.highlightedLegendItemIx].legendItem.element.parentNode);
+                        }
+                    ]
+                ], {
+                    // Only run this module if we have at least one legend - wait for it - item.
+                    validate: function() {
+                        return chart.legend && chart.legend.allItems && !chart.colorAxis;
+                    },
+
+                    // Make elements focusable and accessible
+                    init: function(direction) {
+                        each(chart.legend.allItems, function(item) {
+                            item.legendGroup.element.setAttribute('tabindex', '-1');
+                            item.legendGroup.element.setAttribute('role', 'button');
+                            item.legendGroup.element.setAttribute('aria-label', 'Toggle visibility of series ' + item.name);
+                        });
+                        // Focus first/last item
+                        chart.highlightLegendItem(direction > 0 ? 0 : chart.legend.allItems.length - 1);
+                    }
                 })
             ];
 
@@ -915,6 +970,18 @@
                 parent.appendChild(exportGroupElement);
             }
 
+            // Set screen reader properties on input boxes for range selector. We need to do this regardless of whether or not these are visible, as they are 
+            // by default part of the page's tabindex unless we set them to -1.
+            if (chart.rangeSelector) {
+                each(['minInput', 'maxInput'], function(key, i) {
+                    if (chart.rangeSelector[key]) {
+                        chart.rangeSelector[key].setAttribute('tabindex', '-1');
+                        chart.rangeSelector[key].setAttribute('role', 'textbox');
+                        chart.rangeSelector[key].setAttribute('aria-label', 'Select ' + (i ? 'end' : 'start') + ' date.');
+                    }
+                });
+            }
+
             // Hide text elements from screen readers
             each(textElements, function(el) {
                 el.setAttribute('aria-hidden', 'true');

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

@@ -1,5 +1,5 @@
 /**
- * @license Highcharts JS v5.0.0 (2016-09-29)
+ * @license Highcharts JS v5.0.3 (2016-11-18)
  *
  * (c) 2009-2016 Torstein Honsi
  *

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

@@ -1,5 +1,5 @@
 /**
- * @license Highcharts JS v5.0.0 (2016-09-29)
+ * @license Highcharts JS v5.0.3 (2016-11-18)
  * Boost module
  *
  * (c) 2010-2016 Highsoft AS
@@ -28,14 +28,14 @@
          * 
          * Development plan
          * - Column range.
-         * - Heatmap.
+         * - Heatmap. Modify the heatmap-canvas demo so that it uses this module.
          * - Treemap.
          * - 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
-             that with initial series animation).
+        	 that with initial series animation).
          * - Cache full-size image so we don't have to redraw on hide/show and zoom up. But k-d-tree still
          *   needs to be built.
          * - Test IE9 and IE10.
@@ -108,11 +108,14 @@
         }
 
         // Set default options
-        each(['area', 'arearange', 'column', 'line', 'scatter'], function(type) {
-            if (plotOptions[type]) {
-                plotOptions[type].boostThreshold = 5000;
+        each(
+            ['area', 'arearange', 'bubble', 'column', 'line', 'scatter'],
+            function(type) {
+                if (plotOptions[type]) {
+                    plotOptions[type].boostThreshold = 5000;
+                }
             }
-        });
+        );
 
         /**
          * Override a bunch of methods the same way. If the number of points is below the threshold,
@@ -144,12 +147,11 @@
 
             // A special case for some types - its translate method is already wrapped
             if (method === 'translate') {
-                if (seriesTypes.column) {
-                    wrap(seriesTypes.column.prototype, method, branch);
-                }
-                if (seriesTypes.arearange) {
-                    wrap(seriesTypes.arearange.prototype, method, branch);
-                }
+                each(['arearange', 'bubble', 'column'], function(type) {
+                    if (seriesTypes[type]) {
+                        wrap(seriesTypes[type].prototype, method, branch);
+                    }
+                });
             }
         });
 
@@ -285,7 +287,10 @@
                     r = options.marker && options.marker.radius,
                     cvsDrawPoint = this.cvsDrawPoint,
                     cvsLineTo = options.lineWidth ? this.cvsLineTo : false,
-                    cvsMarker = r <= 1 ? this.cvsMarkerSquare : this.cvsMarkerCircle,
+                    cvsMarker = r && r <= 1 ?
+                    this.cvsMarkerSquare :
+                    this.cvsMarkerCircle,
+                    strokeBatch = this.cvsStrokeBatch || 1000,
                     enableMouseTracking = options.enableMouseTracking !== false,
                     lastPoint,
                     threshold = options.threshold,
@@ -318,7 +323,7 @@
                             ctx.stroke();
                         }
                     },
-                    drawPoint = function(clientX, plotY, yBottom) {
+                    drawPoint = function(clientX, plotY, yBottom, i) {
                         if (c === 0) {
                             ctx.beginPath();
 
@@ -335,14 +340,14 @@
                             } else if (cvsLineTo) {
                                 cvsLineTo(ctx, clientX, plotY);
                             } else if (cvsMarker) {
-                                cvsMarker(ctx, clientX, plotY, r);
+                                cvsMarker.call(series, ctx, clientX, plotY, r, i);
                             }
                         }
 
                         // We need to stroke the line for every 1000 pixels. It will crash the browser
                         // memory use if we stroke too infrequently.
                         c = c + 1;
-                        if (c === 1000) {
+                        if (c === strokeBatch) {
                             stroke();
                             c = 0;
                         }
@@ -483,7 +488,8 @@
                                         drawPoint(
                                             clientX,
                                             hasThreshold ? Math.min(plotY, translatedThreshold) : plotY,
-                                            hasThreshold ? Math.max(yBottom, translatedThreshold) : yBottom
+                                            hasThreshold ? Math.max(yBottom, translatedThreshold) : yBottom,
+                                            i
                                         );
                                         addKDPoint(clientX, plotY, maxI);
                                         if (yBottom !== plotY) {
@@ -497,7 +503,7 @@
                                 }
                             } else {
                                 plotY = Math.round(yAxis.toPixels(y, true));
-                                drawPoint(clientX, plotY, yBottom);
+                                drawPoint(clientX, plotY, yBottom, i);
                                 addKDPoint(clientX, plotY, i);
                             }
                         }
@@ -559,6 +565,15 @@
         };
         seriesTypes.scatter.prototype.fill = true;
 
+        if (seriesTypes.bubble) {
+            seriesTypes.bubble.prototype.cvsMarkerCircle = function(ctx, clientX, plotY, r, i) {
+                ctx.moveTo(clientX, plotY);
+                ctx.arc(clientX, plotY, this.radii && this.radii[i], 0, 2 * Math.PI, false);
+            };
+            seriesTypes.bubble.prototype.cvsStrokeBatch = 1;
+        }
+
+
         extend(seriesTypes.area.prototype, {
             cvsDrawPoint: function(ctx, clientX, plotY, yBottom, lastPoint) {
                 if (lastPoint && clientX !== lastPoint.clientX) {