highcharts-rails 5.0.10 → 5.0.11

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

@@ -1,5 +1,5 @@
 /**
- * @license Highcharts JS v5.0.10 (2017-03-31)
+ * @license Highcharts JS v5.0.11 (2017-05-04)
  * Highcharts funnel module
  *
  * (c) 2010-2017 Torstein Honsi
@@ -28,6 +28,7 @@
         var seriesType = Highcharts.seriesType,
             seriesTypes = Highcharts.seriesTypes,
             noop = Highcharts.noop,
+            pick = Highcharts.pick,
             each = Highcharts.each;
 
 
@@ -115,8 +116,8 @@
                             neckWidth :
                             neckWidth + (width - neckWidth) * (1 - (y - top) / (height - neckHeight));
                     };
-                    series.getX = function(y, half) {
-                        return centerX + (half ? -1 : 1) * ((getWidthAt(reversed ? 2 * centerY - y : y) / 2) + options.dataLabels.distance);
+                    series.getX = function(y, half, point) {
+                        return centerX + (half ? -1 : 1) * ((getWidthAt(reversed ? 2 * centerY - y : y) / 2) + point.labelDistance);
                     };
 
                     // Expose
@@ -250,8 +251,9 @@
                  * Extend the pie data label method
                  */
                 drawDataLabels: function() {
-                    var data = this.data,
-                        labelDistance = this.options.dataLabels.distance,
+                    var series = this,
+                        data = series.data,
+                        labelDistance = series.options.dataLabels.distance,
                         leftSide,
                         sign,
                         point,
@@ -262,7 +264,7 @@
                     // In the original pie label anticollision logic, the slots are distributed
                     // from one labelDistance above to one labelDistance below the pie. In funnels
                     // we don't want this.
-                    this.center[2] -= 2 * labelDistance;
+                    series.center[2] -= 2 * labelDistance;
 
                     // Set the label position array for each point.
                     while (i--) {
@@ -270,15 +272,21 @@
                         leftSide = point.half;
                         sign = leftSide ? 1 : -1;
                         y = point.plotY;
-                        x = this.getX(y, leftSide);
+                        point.labelDistance = pick(
+                            point.options.dataLabels && point.options.dataLabels.distance,
+                            labelDistance
+                        );
+
+                        series.maxLabelDistance = Math.max(point.labelDistance, series.maxLabelDistance || 0);
+                        x = series.getX(y, leftSide, point);
 
                         // set the anchor point for data labels
                         point.labelPos = [
                             0, // first break of connector
                             y, // a/a
-                            x + (labelDistance - 5) * sign, // second break, right outside point shape
+                            x + (point.labelDistance - 5) * sign, // second break, right outside point shape
                             y, // a/a
-                            x + labelDistance * sign, // landing point for connector
+                            x + point.labelDistance * sign, // landing point for connector
                             y, // a/a
                             leftSide ? 'right' : 'left', // alignment
                             0 // center angle

data/app/assets/javascripts/highcharts/modules/grid-axis.js

@@ -1,5 +1,5 @@
 /**
- * @license Highcharts JS v5.0.10 (2017-03-31)
+ * @license Highcharts JS v5.0.11 (2017-05-04)
  * GridAxis
  *
  * (c) 2016 Lars A. V. Cabrera

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

@@ -1,5 +1,5 @@
 /**
- * @license Highcharts JS v5.0.10 (2017-03-31)
+ * @license Highcharts JS v5.0.11 (2017-05-04)
  *
  * (c) 2009-2017 Torstein Honsi
  *
@@ -440,7 +440,7 @@
                 // When updating data classes, destroy old items and make sure new ones are created (#3207)
                 if (newOptions.dataClasses && legend.allItems) {
                     each(legend.allItems, function(item) {
-                        if (item.isDataClass) {
+                        if (item.isDataClass && item.legendGroup) {
                             item.legendGroup.destroy();
                         }
                     });
@@ -458,6 +458,16 @@
                 }
             },
 
+            /**
+             * Extend basic axis remove by also removing the legend item.
+             */
+            remove: function() {
+                if (this.legendItem) {
+                    this.chart.legend.destroyItem(this);
+                }
+                Axis.prototype.remove.call(this);
+            },
+
             /**
              * Get the legend item symbols for data classes
              */

data/app/assets/javascripts/highcharts/modules/no-data-to-display.js

@@ -1,5 +1,5 @@
 /**
- * @license Highcharts JS v5.0.10 (2017-03-31)
+ * @license Highcharts JS v5.0.11 (2017-05-04)
  * Plugin for displaying a message when there is no data visible in chart.
  *
  * (c) 2010-2017 Highsoft AS

data/app/assets/javascripts/highcharts/modules/offline-exporting.js

@@ -1,5 +1,5 @@
 /**
- * @license Highcharts JS v5.0.10 (2017-03-31)
+ * @license Highcharts JS v5.0.11 (2017-05-04)
  * Client side exporting module
  *
  * (c) 2015 Torstein Honsi / Oystein Moseng
@@ -109,7 +109,6 @@
             if (a.download !== undefined) {
                 a.href = dataURL;
                 a.download = filename; // HTML5 download attribute
-                a.target = '_blank';
                 doc.body.appendChild(a);
                 a.click();
                 doc.body.removeChild(a);
@@ -443,7 +442,16 @@
         };
 
         /**
-         * Add a new method to the Chart object to perform a local download
+         * Exporting and offline-exporting modules required. Export a chart to an image
+         * locally in the user's browser.
+         *
+         * @param  {Object} exportingOptions
+         *         Exporting options, the same as in {@link
+         *         Highcharts.Chart#exportChart}.
+         * @param  {Options} chartOptions
+         *         Additional chart options for the exported chart. For example a
+         *         different background color can be added here, or `dataLabels`
+         *         for export only.
          */
         Highcharts.Chart.prototype.exportChartLocal = function(exportingOptions, chartOptions) {
             var chart = this,
@@ -500,7 +508,7 @@
 
         // Extend the default options to use the local exporter logic
         merge(true, Highcharts.getOptions().exporting, {
-            libURL: 'https://code.highcharts.com/5.0.10/lib/',
+            libURL: 'https://code.highcharts.com/5.0.11/lib/',
             buttons: {
                 contextButton: {
                     menuItems: [{

data/app/assets/javascripts/highcharts/modules/overlapping-datalabels.js

@@ -1,5 +1,5 @@
 /**
- * @license Highcharts JS v5.0.10 (2017-03-31)
+ * @license Highcharts JS v5.0.11 (2017-05-04)
  *
  * (c) 2009-2017 Torstein Honsi
  *

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

@@ -1,5 +1,5 @@
 /**
- * @license Highcharts JS v5.0.10 (2017-03-31)
+ * @license Highcharts JS v5.0.11 (2017-05-04)
  *
  * (c) 2009-2017 Torstein Honsi
  *

data/app/assets/javascripts/highcharts/modules/solid-gauge.js

@@ -1,5 +1,5 @@
 /**
- * @license  Highcharts JS v5.0.10 (2017-03-31)
+ * @license  Highcharts JS v5.0.11 (2017-05-04)
  * Solid angular gauge module
  *
  * (c) 2010-2017 Torstein Honsi
@@ -313,7 +313,7 @@
                         }
                     } else {
                         point.graphic = renderer.arc(shapeArgs)
-                            .addClass('highcharts-point')
+                            .addClass(point.getClassName(), true)
                             .attr({
                                 fill: toColor,
                                 'sweep-flag': 0

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

@@ -1,5 +1,5 @@
 /**
- * @license Highcharts JS v5.0.10 (2017-03-31)
+ * @license Highcharts JS v5.0.11 (2017-05-04)
  * Highstock as a plugin for Highcharts
  *
  * (c) 2017 Torstein Honsi
@@ -687,37 +687,6 @@
             }
         });
 
-
-
-        /**
-         * Extend getGraphPath by identifying gaps in the ordinal data so that we can draw a gap in the
-         * line or area
-         */
-        Series.prototype.gappedPath = function() {
-            var gapSize = this.options.gapSize,
-                points = this.points.slice(),
-                i = points.length - 1;
-
-            if (gapSize && i > 0) { // #5008
-
-                // extension for ordinal breaks
-                while (i--) {
-                    if (points[i + 1].x - points[i].x > this.closestPointRange * gapSize) {
-                        points.splice( // insert after this one
-                            i + 1,
-                            0, {
-                                isNull: true
-                            }
-                        );
-                    }
-                }
-            }
-
-            // Call base method
-            //return proceed.call(this, points, a, b);
-            return this.getGraphPath(points);
-        };
-
         /* ****************************************************************************
          * End ordinal axis logic                                                   *
          *****************************************************************************/
@@ -879,17 +848,14 @@
                         length = 0,
                         inBrk,
                         repeat,
-                        brk,
                         min = axis.userMin || axis.min,
                         max = axis.userMax || axis.max,
                         pointRangePadding = pick(axis.pointRangePadding, 0),
                         start,
-                        i,
-                        j;
+                        i;
 
                     // Min & max check (#4247)
-                    for (i in breaks) {
-                        brk = breaks[i];
+                    each(breaks, function(brk) {
                         repeat = brk.repeat || Infinity;
                         if (axis.isInBreak(brk, min)) {
                             min += (brk.to % repeat) - (min % repeat);
@@ -897,11 +863,10 @@
                         if (axis.isInBreak(brk, max)) {
                             max -= (max % repeat) - (brk.from % repeat);
                         }
-                    }
+                    });
 
                     // Construct an array holding all breaks in the axis
-                    for (i in breaks) {
-                        brk = breaks[i];
+                    each(breaks, function(brk) {
                         start = brk.from;
                         repeat = brk.repeat || Infinity;
 
@@ -912,18 +877,18 @@
                             start += repeat;
                         }
 
-                        for (j = start; j < max; j += repeat) {
+                        for (i = start; i < max; i += repeat) {
                             breakArrayT.push({
-                                value: j,
+                                value: i,
                                 move: 'in'
                             });
                             breakArrayT.push({
-                                value: j + (brk.to - brk.from),
+                                value: i + (brk.to - brk.from),
                                 move: 'out',
                                 size: brk.breakSize
                             });
                         }
-                    }
+                    });
 
                     breakArrayT.sort(function(a, b) {
                         var ret;
@@ -939,8 +904,7 @@
                     inBrk = 0;
                     start = min;
 
-                    for (i in breakArrayT) {
-                        brk = breakArrayT[i];
+                    each(breakArrayT, function(brk) {
                         inBrk += (brk.move === 'in' ? 1 : -1);
 
                         if (inBrk === 1 && brk.move === 'in') {
@@ -954,7 +918,7 @@
                             });
                             length += brk.value - start - (brk.size || 0);
                         }
-                    }
+                    });
 
                     axis.breakArray = breakArray;
 
@@ -966,7 +930,7 @@
 
                     if (axis.options.staticScale) {
                         axis.transA = axis.options.staticScale;
-                    } else {
+                    } else if (axis.unitLength) {
                         axis.transA *= (max - axis.min + pointRangePadding) /
                             axis.unitLength;
                     }
@@ -1053,6 +1017,36 @@
             });
         };
 
+
+        /**
+         * Extend getGraphPath by identifying gaps in the data so that we can draw a gap
+         * in the line or area. This was moved from ordinal axis module to broken axis
+         * module as of #5045.
+         */
+        H.Series.prototype.gappedPath = function() {
+            var gapSize = this.options.gapSize,
+                points = this.points.slice(),
+                i = points.length - 1;
+
+            if (gapSize && i > 0) { // #5008
+
+                // extension for ordinal breaks
+                while (i--) {
+                    if (points[i + 1].x - points[i].x > this.closestPointRange * gapSize) {
+                        points.splice( // insert after this one
+                            i + 1,
+                            0, {
+                                isNull: true
+                            }
+                        );
+                    }
+                }
+            }
+
+            // Call base method
+            return this.getGraphPath(points);
+        };
+
         wrap(H.seriesTypes.column.prototype, 'drawPoints', drawPointsWrapped);
         wrap(H.Series.prototype, 'drawPoints', drawPointsWrapped);
 
@@ -1173,9 +1167,10 @@
 
 
             /**
-             * Define the available approximation types. The data grouping approximations takes an array
-             * or numbers as the first parameter. In case of ohlc, four arrays are sent in as four parameters.
-             * Each array consists only of numbers. In case null values belong to the group, the property
+             * Define the available approximation types. The data grouping
+             * approximations takes an array or numbers as the first parameter. In case
+             * of ohlc, four arrays are sent in as four parameters. Each array consists
+             * only of numbers. In case null values belong to the group, the property
              * .hasNulls will be set to true on the array.
              */
             approximations = {
@@ -1202,14 +1197,25 @@
                     var len = arr.length,
                         ret = approximations.sum(arr);
 
-                    // If we have a number, return it divided by the length. If not, return
-                    // null or undefined based on what the sum method finds.
+                    // If we have a number, return it divided by the length. If not,
+                    // return null or undefined based on what the sum method finds.
                     if (isNumber(ret) && len) {
                         ret = ret / len;
                     }
 
                     return ret;
                 },
+                // The same as average, but for series with multiple values, like area
+                // ranges.
+                averages: function() { // #5479
+                    var ret = [];
+
+                    each(arguments, function(arr) {
+                        ret.push(approximations.average(arr));
+                    });
+
+                    return ret;
+                },
                 open: function(arr) {
                     return arr.length ? arr[0] : (arr.hasNulls ? null : undefined);
                 },
@@ -1247,8 +1253,8 @@
 
 
         /**
-         * Takes parallel arrays of x and y data and groups the data into intervals defined by groupPositions, a collection
-         * of starting x values for each group.
+         * Takes parallel arrays of x and y data and groups the data into intervals 
+         * defined by groupPositions, a collection of starting x values for each group.
          */
         seriesProto.groupData = function(xData, yData, groupPositions, approximation) {
             var series = this,
@@ -1261,19 +1267,35 @@
                 pointX,
                 pointY,
                 groupedY,
-                handleYData = !!yData, // when grouping the fake extended axis for panning, we don't need to consider y
-                values = [
-                    [],
-                    [],
-                    [],
-                    []
-                ],
-                approximationFn = typeof approximation === 'function' ? approximation : approximations[approximation],
+                // when grouping the fake extended axis for panning,
+                // we don't need to consider y
+                handleYData = !!yData,
+                values = [],
+                approximationFn = typeof approximation === 'function' ?
+                approximation :
+                approximations[approximation] ||
+                // if the approximation is not found use default series type
+                // approximation (#2914)
+                (
+                    specificOptions[series.type] &&
+                    approximations[specificOptions[series.type].approximation]
+                ) || approximations[commonOptions.approximation],
                 pointArrayMap = series.pointArrayMap,
                 pointArrayMapLength = pointArrayMap && pointArrayMap.length,
-                i,
                 pos = 0,
-                start = 0;
+                start = 0,
+                valuesLen,
+                i, j;
+
+            // Calculate values array size from pointArrayMap length
+            if (pointArrayMapLength) {
+                each(pointArrayMap, function() {
+                    values.push([]);
+                });
+            } else {
+                values.push([]);
+            }
+            valuesLen = pointArrayMapLength || 1;
 
             // Start with the first point within the X axis range (#2696)
             for (i = 0; i <= dataLength; i++) {
@@ -1284,9 +1306,12 @@
 
             for (i; i <= dataLength; i++) {
 
-                // when a new group is entered, summarize and initiate the previous group
-                while ((groupPositions[pos + 1] !== undefined && xData[i] >= groupPositions[pos + 1]) ||
-                    i === dataLength) { // get the last group
+                // when a new group is entered, summarize and initiate 
+                // the previous group
+                while ((
+                        groupPositions[pos + 1] !== undefined &&
+                        xData[i] >= groupPositions[pos + 1]
+                    ) || i === dataLength) { // get the last group
 
                     // get group x and y
                     pointX = groupPositions[pos];
@@ -1305,10 +1330,10 @@
 
                     // reset the aggregate arrays
                     start = i;
-                    values[0] = [];
-                    values[1] = [];
-                    values[2] = [];
-                    values[3] = [];
+                    for (j = 0; j < valuesLen; j++) {
+                        values[j].length = 0; // faster than values[j] = []
+                        values[j].hasNulls = false;
+                    }
 
                     // Advance on the group positions
                     pos += 1;
@@ -1324,14 +1349,15 @@
                     break;
                 }
 
-                // for each raw data point, push it to an array that contains all values for this specific group
+                // for each raw data point, push it to an array that contains all values
+                // for this specific group
                 if (pointArrayMap) {
 
                     var index = series.cropStart + i,
-                        point = (data && data[index]) || series.pointClass.prototype.applyOptions.apply({
+                        point = (data && data[index]) ||
+                        series.pointClass.prototype.applyOptions.apply({
                             series: series
                         }, [dataOptions[index]]),
-                        j,
                         val;
 
                     for (j = 0; j < pointArrayMapLength; j++) {
@@ -1738,7 +1764,7 @@
             toYData: function(point) { // return a plain array for speedy calculation
                 return [point.open, point.high, point.low, point.close];
             },
-            pointValKey: 'high',
+            pointValKey: 'close',
 
 
             pointAttrToOptions: {
@@ -1791,6 +1817,10 @@
                             point[translated[i]] = yAxis.toPixels(value, true);
                         }
                     });
+
+                    // Align the tooltip to the high value to avoid covering the point
+                    point.tooltipPos[1] =
+                        point.plotHigh + yAxis.pos - series.chart.plotTop;
                 });
             },
 
@@ -1835,7 +1865,7 @@
                             'M',
                             crispX, Math.round(point.yBottom),
                             'L',
-                            crispX, Math.round(point.plotY)
+                            crispX, Math.round(point.plotHigh)
                         ];
 
                         // open
@@ -2005,7 +2035,7 @@
                         topBox = Math.min(plotOpen, plotClose);
                         bottomBox = Math.max(plotOpen, plotClose);
                         halfWidth = Math.round(point.shapeArgs.width / 2);
-                        hasTopWhisker = Math.round(topBox) !== Math.round(point.plotY);
+                        hasTopWhisker = Math.round(topBox) !== Math.round(point.plotHigh);
                         hasBottomWhisker = bottomBox !== point.yBottom;
                         topBox = Math.round(topBox) + crispCorr;
                         bottomBox = Math.round(bottomBox) + crispCorr;
@@ -2028,7 +2058,7 @@
                             'M',
                             crispX, topBox,
                             'L',
-                            crispX, hasTopWhisker ? Math.round(point.plotY) : topBox, // #460, #2094
+                            crispX, hasTopWhisker ? Math.round(point.plotHigh) : topBox, // #460, #2094
                             'M',
                             crispX, bottomBox,
                             'L',
@@ -3052,7 +3082,7 @@
                 each(this._events, function(args) {
                     removeEvent.apply(null, args);
                 });
-                this._events = undefined;
+                this._events.length = 0;
             },
 
             /**
@@ -3124,6 +3154,7 @@
                 scrollMin = Math.min(pick(axis.options.min, axis.min), axis.min, axis.dataMin),
                 scrollMax = Math.max(pick(axis.options.max, axis.max), axis.max, axis.dataMax),
                 scrollbar = axis.scrollbar,
+                titleOffset = axis.titleOffset || 0,
                 offsetsIndex,
                 from,
                 to;
@@ -3136,7 +3167,10 @@
                     scrollbar.position(
                         axis.left,
                         axis.top + axis.height + 2 + axis.chart.scrollbarsOffsets[1] +
-                        (axis.opposite ? 0 : axis.axisTitleMargin + axis.offset),
+                        (axis.opposite ?
+                            0 :
+                            titleOffset + axis.axisTitleMargin + axis.offset
+                        ),
                         axis.width,
                         axis.height
                     );
@@ -3144,7 +3178,10 @@
                 } else {
                     scrollbar.position(
                         axis.left + axis.width + 2 + axis.chart.scrollbarsOffsets[0] +
-                        (axis.opposite ? axis.axisTitleMargin + axis.offset : 0),
+                        (axis.opposite ?
+                            titleOffset + axis.axisTitleMargin + axis.offset :
+                            0
+                        ),
                         axis.top,
                         axis.width,
                         axis.height
@@ -3645,6 +3682,7 @@
                     scrollbarHeight = navigator.scrollbarHeight,
                     navigatorSize,
                     xAxis = navigator.xAxis,
+                    scrollbarXAxis = xAxis.fake ? chart.xAxis[0] : xAxis,
                     navigatorEnabled = navigator.navigatorEnabled,
                     zoomedMin,
                     zoomedMax,
@@ -3745,7 +3783,9 @@
                     if (inverted) {
                         scrollbarTop = navigator.top - scrollbarHeight;
                         scrollbarLeft = navigator.left - scrollbarHeight +
-                            (navigatorEnabled ? 0 : navigator.height);
+                            (navigatorEnabled ? 0 : (scrollbarXAxis.titleOffset || 0) +
+                                scrollbarXAxis.axisTitleMargin
+                            );
                         scrollbarHeight = navigatorSize + 2 * scrollbarHeight;
                     } else {
                         scrollbarTop = navigator.top +
@@ -5522,15 +5562,15 @@
              * Destroys allocated elements.
              */
             destroy: function() {
-                var minInput = this.minInput,
-                    maxInput = this.maxInput,
-                    key;
+                var rSelector = this,
+                    minInput = rSelector.minInput,
+                    maxInput = rSelector.maxInput;
 
-                this.unMouseDown();
-                this.unResize();
+                rSelector.unMouseDown();
+                rSelector.unResize();
 
                 // Destroy elements in collections
-                destroyObjectProperties(this.buttons);
+                destroyObjectProperties(rSelector.buttons);
 
                 // Clear input element events
                 if (minInput) {
@@ -5541,18 +5581,18 @@
                 }
 
                 // Destroy HTML and SVG elements
-                for (key in this) {
-                    if (this[key] && key !== 'chart') {
-                        if (this[key].destroy) { // SVGElement
-                            this[key].destroy();
-                        } else if (this[key].nodeType) { // HTML element
+                H.objectEach(rSelector, function(val, key) {
+                    if (val && key !== 'chart') {
+                        if (val.destroy) { // SVGElement
+                            val.destroy();
+                        } else if (val.nodeType) { // HTML element
                             discardElement(this[key]);
                         }
                     }
-                    if (this[key] !== RangeSelector.prototype[key]) {
-                        this[key] = null;
+                    if (val !== RangeSelector.prototype[key]) {
+                        rSelector[key] = null;
                     }
-                }
+                }, this);
             }
         };
 
@@ -5606,8 +5646,15 @@
                 range,
                 // Get the true range from a start date
                 getTrueRange = function(base, count) {
-                    var date = new Date(base);
-                    date['set' + timeName](date['get' + timeName]() + count);
+                    var date = new Date(base),
+                        basePeriod = date['get' + timeName]();
+
+                    date['set' + timeName](basePeriod + count);
+
+                    if (basePeriod === date['get' + timeName]()) {
+                        date.setDate(0); // #6537
+                    }
+
                     return date.getTime() - base;
                 };
 
@@ -5715,6 +5762,7 @@
             each = H.each,
             extend = H.extend,
             format = H.format,
+            grep = H.grep,
             inArray = H.inArray,
             isNumber = H.isNumber,
             isString = H.isString,
@@ -5973,7 +6021,13 @@
             // lines (#2796).
             uniqueAxes = axes.length ? [] : [axis.isXAxis ? chart.yAxis[0] : chart.xAxis[0]]; //#3742
             each(axes, function(axis2) {
-                if (inArray(axis2, uniqueAxes) === -1) {
+                if (
+                    inArray(axis2, uniqueAxes) === -1 &&
+                    // Do not draw on axis which overlap completely. #5424
+                    !H.find(uniqueAxes, function(unique) {
+                        return unique.pos === axis2.pos && unique.len && axis2.len;
+                    })
+                ) {
                     uniqueAxes.push(axis2);
                 }
             });
@@ -6320,7 +6374,7 @@
 
                 // find the first value for comparison
                 for (i = 0; i < length - 1; i++) {
-                    compareValue = keyIndex > -1 ?
+                    compareValue = processedYData[i] && keyIndex > -1 ?
                         processedYData[i][keyIndex] :
                         processedYData[i];
                     if (isNumber(compareValue) && processedXData[i + 1] >= series.xAxis.min && compareValue !== 0) {
@@ -6416,5 +6470,32 @@
             proceed.call(this);
         });
 
+        wrap(Chart.prototype, 'getSelectedPoints', function(proceed) {
+            var points = proceed.call(this);
+
+            each(this.series, function(serie) {
+                // series.points - for grouped points (#6445)
+                if (serie.hasGroupedData) {
+                    points = points.concat(grep(serie.points || [], function(point) {
+                        return point.selected;
+                    }));
+                }
+            });
+            return points;
+        });
+
+        wrap(Chart.prototype, 'update', function(proceed, options) {
+            // Use case: enabling scrollbar from a disabled state.
+            // Scrollbar needs to be initialized from a controller, Navigator in this
+            // case (#6615)
+            if ('scrollbar' in options && this.navigator) {
+                merge(true, this.options.scrollbar, options.scrollbar);
+                this.navigator.update({}, false);
+                delete options.scrollbar;
+            }
+
+            return proceed.apply(this, Array.prototype.slice.call(arguments, 1));
+        });
+
     }(Highcharts));
 }));