highcharts-rails 4.2.6 → 4.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f77a535a0b707c51c4f72e52ddf05fe4e3b911c3
-  data.tar.gz: 6c75ffb6a157954665f1abd492d403529a3b557e
+  metadata.gz: 6c8a7e896fdcd7def1e83f3bcb1feb6872433807
+  data.tar.gz: b537b34e4eb511cc9990cf2849b906b5728ba8d1
 SHA512:
-  metadata.gz: af2b1ec95756ae60312e86e5b7bbbfd3af55d35e9df0b0a910bfd7e8499d4304e859c7da71f8d2fe2ad7b951c3b28405cb5a31bed565485578050f7294d4dabb
-  data.tar.gz: 76c61a2be05c827cf727b7ad23c99672f75d267646c977fc8f441365c6b6489d46d261001424be87d44e7a3e38155c1c7597bf466eff706b925a384bba00ae9b
+  metadata.gz: 42aed7fd6c6bd1bb90b4978307e5c2c025f4ede7fd283b09c12caf5313ec2d3741a8cd219c2541a5c38d91f9a3c43a4c23c9fa92b54a73c1ee86e4b14dd81bdc
+  data.tar.gz: 3642d9b1dc37b3f36a99972683ec45315091a1cc13db9487efdd435b0cfb25a02f9200142e14160b4564a6d14b9620e93a5856a3542a7698c3d43be9722b3b26

data/CHANGELOG.markdown

@@ -1,3 +1,49 @@
+# 4.2.7 / 2017-01-25
+
+* Updated Highcharts to 4.2.7 (2016-09-21)
+  * Added new feature, yAxis.angle, allowing positioning the axis line and labels in polar chart Y axes. This makes it practical to use multiple axes in polar charts.
+  * Added option, xAxis.nameToX, allowing points to have the same name but different axis positions on an axis of type category.
+  * Bug fixes
+    * Fixed #1011, ignoreHiddenSeries with ordinal axis caused artefacts on a chart.
+    * Fixed #1041, gaps in the area fill of stacked areasplines.
+    * Fixed #3169, error on drilldown from a null point.
+    * Fixed #3341, exceeded stack size on mutually linked series.
+    * Fixed #3571, NaN in the beginning of data broke series.
+    * Fixed #4778, wrong rendering waterfall series, when yAxis.max was set.
+    * Fixed #5186, gaps in the fill of areasplinerange.
+    * Fixed #5383, mouse position detection with pointPlacement.
+    * Fixed #5528, a regression causing polar arearanges to fail.
+    * Fixed #5533, stickyTracking when set to false caused highlighting wrong point.
+    * Fixed #5552, linejoins in boost module lines.
+    * Fixed #5556, JS error on polygon with empty data.
+    * Fixed #5563, JS error in treemap with zero values.
+    * Fixed #5568, pointIntervalUnit broke when using more data points than turboThreshold.
+    * Fixed #5569, generic options set on the yAxis affected the colorAxis.
+    * Fixed #5570 and #5590, regression causing blank export on Batik based export servers.
+    * Fixed #5572, pie slices were not hidden in 3D pie charts on legend click.
+    * Fixed #5595, HTML tooltip did not hide on point mouse out via the tooltip.
+    * Fixed #5605, error on async onload of destroyed chart.
+    * Fixed #5618, updating master series caused wrong visibility on linked series.
+    * Fixed #5619, the Series remove event was fired when updating a series.
+    * Fixed #5620, text was mispositioned when loading a chart in a hidden iframe in certain browsers.
+    * Fixed #5622, click event for line series point was not called when column was rendered below.
+    * Fixed #5631, zeroes in logarithmic chart made the whole graph crash.
+    * Fixed #5632, gaps were broken in arearange and areasplinerange.
+    * Fixed #5646, waterfall did not work correctly with logarithmic axis.
+    * Fixed #5647, xrange points disappeared if x was outside plot but x2 inside.
+    * Fixed #5647, xrange points disappeared when x was outside visible range.
+    * Fixed #5655, animation: true on a series config caused animation to jump from the middle.
+    * Fixed #5658, error on updating series from its own mouseOver event.
+    * Fixed #5662, setExtremes on polar chart caused padded max value.
+    * Fixed #5665, addPoint animation parameter was not used.
+    * Fixed #5679, handle isArray for ES6 iterator.
+    * Fixed #5681, JS error on adding custom group to points.
+    * Fixed #5689, text had soft line wraps when white-space: nowrap was used in combination with text-overflow: ellipsis.
+    * Fixed issue #4133, error bar data labels positions failing on redraw.
+    * Fixed issue #5205, color axis changed colors when legend was disabled.
+    * Fixed issue #5567, wrong clipping of offline exported SVG in IE11/Edge.
+    * Fixed wrong handling of minRange on logarithmic axis, related to #1227.
+
 # 4.2.6 / 2017-01-25
 
 * Updated Highcharts to 4.2.6 (2016-08-02)

data/Rakefile

@@ -26,6 +26,7 @@ task :update, :version do |t, args|
     "broken-axis.src.js"          => "highcharts/modules/broken-axis.js",
     "boost.src.js"                => "highcharts/modules/boost.js",
     "offline-exporting.src.js"    => "highcharts/modules/offline-exporting.js",
+    "series-label.src.js"         => "highcharts/modules/series-label.js",
   }
   dest = "app/assets/javascripts/"
   Dir.glob("tmp/#{version}/js/**/*.src.js").each do |file|

data/app/assets/javascripts/highcharts.js

@@ -2,7 +2,7 @@
 // @compilation_level SIMPLE_OPTIMIZATIONS
 
 /**
- * @license Highcharts JS v4.2.6 (2016-08-02)
+ * @license Highcharts JS v4.2.7 (2016-09-21)
  *
  * (c) 2009-2016 Torstein Honsi
  *
@@ -59,7 +59,7 @@
         charts = [],
         chartCount = 0,
         PRODUCT = 'Highcharts',
-        VERSION = '4.2.6',
+        VERSION = '4.2.7',
 
         // some constants for frequently used strings
         DIV = 'div',
@@ -72,7 +72,7 @@
         NONE = 'none',
         M = 'M',
         L = 'L',
-        numRegex = /^[0-9]+$/,
+        numRegex = /[0-9]/g,
         NORMAL_STATE = '',
         HOVER_STATE = 'hover',
         SELECT_STATE = 'select',
@@ -481,7 +481,7 @@
                         value = original[key];
 
                         // Copy the contents of objects, but not arrays or DOM nodes
-                        if (value && typeof value === 'object' && Object.prototype.toString.call(value) !== '[object Array]' &&
+                        if (Highcharts.isObject(value, true) &&
                                 key !== 'renderTo' && typeof value.nodeType !== 'number') {
                             copy[key] = doCopy(copy[key] || {}, value);
 
@@ -531,7 +531,8 @@
      * @param {Object} obj
      */
     function isArray(obj) {
-        return Object.prototype.toString.call(obj) === '[object Array]';
+        var str = Object.prototype.toString.call(obj);
+        return str === '[object Array]' || str === '[object Array Iterator]';
     }
 
     /**
@@ -1601,7 +1602,7 @@
             useUTC: true,
             //timezoneOffset: 0,
             canvasToolsURL: 'http://code.highcharts.com/modules/canvas-tools.js',
-            VMLRadialGradientURL: 'http://code.highcharts.com/4.2.6/gfx/vml-radial-gradient.png'
+            VMLRadialGradientURL: 'http://code.highcharts.com/4.2.7/gfx/vml-radial-gradient.png'
         },
         chart: {
             //animation: true,
@@ -2871,19 +2872,16 @@
 
             if (textStr !== UNDEFINED) {
 
-                // Properties that affect bounding box
-                cacheKey = ['', rotation || 0, styles && styles.fontSize, element.style.width].join(',');
+                cacheKey = 
 
-                // Since numbers are monospaced, and numerical labels appear a lot in a chart,
-                // we assume that a label of n characters has the same bounding box as others
-                // of the same length.
-                if (textStr === '' || numRegex.test(textStr)) {
-                    cacheKey = 'num:' + textStr.toString().length + cacheKey;
+                    // Since numbers are monospaced, and numerical labels appear a lot in a chart,
+                    // we assume that a label of n characters has the same bounding box as others
+                    // of the same length.
+                    textStr.toString().replace(numRegex, '0') + 
+
+                    // Properties that affect bounding box
+                    ['', rotation || 0, styles && styles.fontSize, element.style.width].join(',');
 
-                // Caching all strings reduces rendering time by 4-5%.
-                } else {
-                    cacheKey = textStr + cacheKey;
-                }
             }
 
             if (cacheKey && !reload) {
@@ -2963,8 +2961,9 @@
                     }
                 }
 
-                // Cache it
-                if (cacheKey) {
+                // Cache it. When loading a chart in a hidden iframe in Firefox and IE/Edge, the
+                // bounding box height is 0, so don't cache it (#5620).
+                if (cacheKey && bBox.height > 0) {
 
                     // Rotate (#4681)
                     while (cacheKeys.length > 250) {
@@ -3240,10 +3239,6 @@
         alignSetter: function (value) {
             this.element.setAttribute('text-anchor', { left: 'start', center: 'middle', right: 'end' }[value]);
         },
-        opacitySetter: function (value, key, element) {
-            this[key] = value;
-            element.setAttribute(key, value);
-        },
         titleSetter: function (value) {
             var titleNode = this.element.getElementsByTagName('title')[0];
             if (!titleNode) {
@@ -3355,6 +3350,13 @@
                 this.doTransform = true;
             };
 
+    // These setters both set the key on the instance itself plus as an attribute
+    SVGElement.prototype.opacitySetter = SVGElement.prototype.displaySetter = function (value, key, element) {
+        this[key] = value;
+        element.setAttribute(key, value);
+    };
+    
+
     // WebKit and Batik have problems with a stroke-width of zero, so in this case we remove the
     // stroke attribute altogether. #1270, #1369, #3065, #3072.
     SVGElement.prototype['stroke-widthSetter'] = SVGElement.prototype.strokeSetter = function (value, key, element) {
@@ -3380,7 +3382,6 @@
     };
     SVGRenderer.prototype = {
         Element: SVGElement,
-
         /**
          * Initialize the SVGRenderer
          * @param {Object} container
@@ -3683,7 +3684,8 @@
                                 // Check width and apply soft breaks or ellipsis
                                 if (width) {
                                     var words = span.replace(/([^\^])-/g, '$1- ').split(' '), // #1273
-                                        hasWhiteSpace = spans.length > 1 || lineNo || (words.length > 1 && textStyles.whiteSpace !== 'nowrap'),
+                                        noWrap = textStyles.whiteSpace === 'nowrap',
+                                        hasWhiteSpace = spans.length > 1 || lineNo || (words.length > 1 && !noWrap),
                                         tooLong,
                                         actualWidth,
                                         rest = [],
@@ -3727,7 +3729,7 @@
                                             words = rest;
                                             rest = [];
 
-                                            if (words.length) {
+                                            if (words.length && !noWrap) {
                                                 softLineNo++;
 
                                                 tspan = doc.createElementNS(SVG_NS, 'tspan');
@@ -4158,7 +4160,6 @@
                     height,
                     options
                 ),
-
                 imageRegex = /^url\((.*?)\)$/,
                 imageSrc,
                 imageSize,
@@ -4222,6 +4223,8 @@
                     createElement('img', {
                         onload: function () {
 
+                            var chart = charts[ren.chartIndex];
+
                             // Special case for SVGs on IE11, the width is not accessible until the image is
                             // part of the DOM (#2854).
                             if (this.width === 0) {
@@ -4242,8 +4245,8 @@
 
                             // Fire the load event when all external images are loaded
                             ren.imgCount--;
-                            if (!ren.imgCount && charts[ren.chartIndex].onload) {
-                                charts[ren.chartIndex].onload();
+                            if (!ren.imgCount && chart && chart.onload) {
+                                chart.onload();
                             }
                         },
                         src: imageSrc
@@ -4564,7 +4567,8 @@
                 crispAdjust = 0,
                 deferredAttr = {},
                 baselineOffset,
-                needsBox,
+                hasBGImage = /^url\((.*?)\)$/.test(shape),
+                needsBox = hasBGImage,
                 updateBoxSize,
                 updateTextPadding,
                 boxAttr;
@@ -4594,7 +4598,7 @@
                         // create the border box if it is not already present
                         boxX = crispAdjust;
                         boxY = (baseline ? -baselineOffset : 0) + crispAdjust;
-                        wrapper.box = box = renderer.symbols[shape] ? // Symbol definition exists (#5324)
+                        wrapper.box = box = renderer.symbols[shape] || hasBGImage ? // Symbol definition exists (#5324)
                                 renderer.symbol(shape, boxX, boxY, wrapper.width, wrapper.height, deferredAttr) :
                                 renderer.rect(boxX, boxY, wrapper.width, wrapper.height, 0, deferredAttr[STROKE_WIDTH]);
 
@@ -5016,7 +5020,7 @@
                 addSetters = function (element, style) {
                     // These properties are set as attributes on the SVG group, and as
                     // identical CSS properties on the div. (#3542)
-                    each(['opacity', 'visibility'], function (prop) {
+                    each(['display', 'opacity', 'visibility'], function (prop) {
                         wrap(element, prop + 'Setter', function (proceed, value, key, elem) {
                             proceed.call(this, value, key, elem);
                             style[key] = value;
@@ -5107,7 +5111,9 @@
                                     position: ABSOLUTE,
                                     left: (parentGroup.translateX || 0) + PX,
                                     top: (parentGroup.translateY || 0) + PX,
-                                    opacity: parentGroup.opacity // #5075
+                                    display: parentGroup.display,
+                                    opacity: parentGroup.opacity, // #5075
+                                    pointerEvents: parentGroup.styles && parentGroup.styles.pointerEvents // #5595
                                 }, htmlGroup || container); // the top group is appended to container
 
                                 // Shortcut
@@ -5619,6 +5625,9 @@
             }
             element.style[key] = value;
         },
+        displaySetter: function (value, key, element) {
+            element.style[key] = value;
+        },
         xSetter: function (value, key, element) {
             this[key] = value; // used in getter
 
@@ -7174,7 +7183,7 @@
 
             // Flag, isXAxis
             axis.isXAxis = isXAxis;
-            axis.coll = isXAxis ? 'xAxis' : 'yAxis';
+            axis.coll = axis.coll || (isXAxis ? 'xAxis' : 'yAxis');
 
             axis.opposite = userOptions.opposite; // needed in setOptions
             axis.side = userOptions.side || (axis.horiz ?
@@ -7202,7 +7211,8 @@
             axis.zoomEnabled = options.zoomEnabled !== false;
 
             // Initial categories
-            axis.categories = options.categories || type === 'category';
+            axis.hasNames = type === 'category' || options.categories === true;
+            axis.categories = options.categories || axis.hasNames;
             axis.names = axis.names || []; // Preserve on update (#3830)
 
             // Elements
@@ -7286,7 +7296,7 @@
 
             // Register
             if (inArray(axis, chart.axes) === -1) { // don't add it again on Axis.update()
-                if (isXAxis && !this.isColorAxis) { // #2713
+                if (isXAxis) { // #2713
                     chart.axes.splice(chart.xAxis.length, 0, axis);
                 } else {
                     chart.axes.push(axis);
@@ -7324,7 +7334,7 @@
         setOptions: function (userOptions) {
             this.options = merge(
                 this.defaultOptions,
-                this.isXAxis ? {} : this.defaultYAxisOptions,
+                this.coll === 'yAxis' && this.defaultYAxisOptions,
                 [this.defaultTopAxisOptions, this.defaultRightAxisOptions,
                     this.defaultBottomAxisOptions, this.defaultLeftAxisOptions][this.side],
                 merge(
@@ -7740,13 +7750,13 @@
                 // if min and max options have been set, don't go beyond it
                 minArgs = [min - zoomOffset, pick(options.min, min - zoomOffset)];
                 if (spaceAvailable) { // if space is available, stay within the data range
-                    minArgs[2] = axis.dataMin;
+                    minArgs[2] = axis.isLog ? axis.log2lin(axis.dataMin) : axis.dataMin;
                 }
                 min = arrayMax(minArgs);
 
                 maxArgs = [min + minRange, pick(options.max, min + minRange)];
                 if (spaceAvailable) { // if space is availabe, stay within the data range
-                    maxArgs[2] = axis.dataMax;
+                    maxArgs[2] = axis.isLog ? axis.log2lin(axis.dataMax) : axis.dataMax;
                 }
 
                 max = arrayMin(maxArgs);
@@ -7785,6 +7795,68 @@
             return ret;
         },
 
+        /**
+         * When a point name is given and no x, search for the name in the existing categories,
+         * or if categories aren't provided, search names or create a new category (#2522).
+         */
+        nameToX: function (point) {
+            var explicitCategories = isArray(this.categories),
+                names = explicitCategories ? this.categories : this.names,
+                nameX = point.options.x,
+                x;
+
+            point.series.requireSorting = false;
+
+            if (!defined(nameX)) {
+                nameX = this.options.nameToX === false ?
+                    point.series.autoIncrement() : 
+                    inArray(point.name, names);
+            }
+            if (nameX === -1) { // The name is not found in currenct categories
+                if (!explicitCategories) {
+                    x = names.length;
+                }
+            } else {
+                x = nameX;
+            }
+
+            // Write the last point's name to the names array
+            this.names[x] = point.name;
+
+            return x;
+        },
+
+        /**
+         * When changes have been done to series data, update the axis.names.
+         */
+        updateNames: function () {
+            var axis = this;
+
+            if (this.names.length > 0) {
+                this.names.length = 0;
+                this.minRange = undefined;
+                each(this.series || [], function (series) {
+            
+                    // When adding a series, points are not yet generated
+                    if (!series.processedXData) {
+                        series.processData();
+                        series.generatePoints();
+                    }
+
+                    each(series.points, function (point, i) {
+                        var x;
+                        if (point.options && point.options.x === undefined) {
+                            x = axis.nameToX(point);
+                            if (x !== point.x) {
+                                point.x = x;
+                                series.xData[i] = x;
+                            }
+                        }
+                    });
+                });
+            }
+        },
+
         /**
          * Update translation information
          */
@@ -8065,7 +8137,7 @@
             }
 
             // Prevent ticks from getting so close that we can't draw the labels
-            if (!this.tickAmount && this.len) { // Color axis with disabled legend has no length
+            if (!this.tickAmount) {
                 axis.tickInterval = axis.unsquish();
             }
 
@@ -8637,7 +8709,7 @@
                 labelMetrics = this.labelMetrics(),
                 textOverflowOption = labelOptions.style.textOverflow,
                 css,
-                labelLength = 0,
+                maxLabelLength = 0,
                 label,
                 i,
                 pos;
@@ -8647,20 +8719,22 @@
                 attr.rotation = labelOptions.rotation || 0; // #4443
             }
 
+            // Get the longest label length
+            each(tickPositions, function (tick) {
+                tick = ticks[tick];
+                if (tick && tick.labelLength > maxLabelLength) {
+                    maxLabelLength = tick.labelLength;
+                }
+            });
+            this.maxLabelLength = maxLabelLength;
+        
+
             // Handle auto rotation on horizontal axis
             if (this.autoRotation) {
 
-                // Get the longest label length
-                each(tickPositions, function (tick) {
-                    tick = ticks[tick];
-                    if (tick && tick.labelLength > labelLength) {
-                        labelLength = tick.labelLength;
-                    }
-                });
-
                 // Apply rotation only if the label is too wide for the slot, and
                 // the label is wider than its height.
-                if (labelLength > innerWidth && labelLength > labelMetrics.h) {
+                if (maxLabelLength > innerWidth && maxLabelLength > labelMetrics.h) {
                     attr.rotation = this.labelRotation;
                 } else {
                     this.labelRotation = 0;
@@ -8701,7 +8775,7 @@
             // Add ellipsis if the label length is significantly longer than ideal
             if (attr.rotation) {
                 css = {
-                    width: (labelLength > chart.chartHeight * 0.5 ? chart.chartHeight * 0.33 : chart.chartHeight) + PX
+                    width: (maxLabelLength > chart.chartHeight * 0.5 ? chart.chartHeight * 0.33 : chart.chartHeight) + PX
                 };
                 if (!textOverflowOption) {
                     css.textOverflow = 'ellipsis';
@@ -9684,12 +9758,12 @@
                     fill: options.backgroundColor,
                     'stroke-width': borderWidth,
                     r: options.borderRadius,
-                    zIndex: 8
+                    zIndex: 8,
+                    display: 'none' // #2301, #2657, #3532, #5570
                 })
                 .css(style)
                 .css({ padding: 0 }) // Remove it from VML, the padding is applied as an attribute instead (#1117)
-                .add()
-                .attr({ y: -9e9 }); // #2301, #2657, #3532
+                .add();
 
             // When using canVG the shadow shows up as a gray circle
             // even if the tooltip is hidden.
@@ -10013,7 +10087,10 @@
                 // show it
                 if (tooltip.isHidden) {
                     stop(label);
-                    label.attr('opacity', 1).show();
+                    label.attr({
+                        opacity: 1,
+                        display: 'block'
+                    }).show();
                 }
 
                 // update text
@@ -10290,16 +10367,15 @@
                 tooltip = chart.tooltip,
                 shared = tooltip ? tooltip.shared : false,
                 followPointer,
+                updatePosition = true,
                 hoverPoint = chart.hoverPoint,
                 hoverSeries = chart.hoverSeries,
                 i,
-                distance = [Number.MAX_VALUE, Number.MAX_VALUE], // #4511
                 anchor,
                 noSharedTooltip,
                 stickToHoverSeries,
                 directTouch,
                 kdpoints = [],
-                kdpoint = [],
                 kdpointT;
 
             // For hovering over the empty parts of the plot area (hoverSeries is undefined).
@@ -10317,10 +10393,15 @@
             // search the k-d tree.
             stickToHoverSeries = hoverSeries && (shared ? hoverSeries.noSharedTooltip : hoverSeries.directTouch);
             if (stickToHoverSeries && hoverPoint) {
-                kdpoint = [hoverPoint];
+                kdpoints = [hoverPoint];
 
             // Handle shared tooltip or cases where a series is not yet hovered
             } else {
+                // When we have non-shared tooltip and sticky tracking is disabled,
+                // search for the closest point only on hovered series: #5533, #5476
+                if (!shared && hoverSeries && !hoverSeries.options.stickyTracking) {
+                    series = [hoverSeries];
+                }
                 // Find nearest points on all series
                 each(series, function (s) {
                     // Skip hidden series
@@ -10333,25 +10414,22 @@
                         }
                     }
                 });
-                // Find absolute nearest point
-                each(kdpoints, function (p) {
-                    if (p) {
-                        // Store both closest points, using point.dist and point.distX comparisons (#4645):
-                        each(['dist', 'distX'], function (dist, k) {
-                            if (isNumber(p[dist])) {
-                                var
-                                    // It is closer than the reference point
-                                    isCloser = p[dist] < distance[k],
-                                    // It is equally close, but above the reference point (#4679)
-                                    isAbove = p[dist] === distance[k] && p.series.group.zIndex >= kdpoint[k].series.group.zIndex;
-
-                                if (isCloser || isAbove) {
-                                    distance[k] = p[dist];
-                                    kdpoint[k] = p;
-                                }
-                            }
-                        });
+
+                // Sort kdpoints by distance to mouse pointer
+                kdpoints.sort(function (p1, p2) {
+                    var isCloserX = p1.distX - p2.distX,
+                        isCloser = p1.dist - p2.dist,
+                        isAbove = p1.series.group.zIndex > p2.series.group.zIndex ? -1 : 1;
+                    // We have two points which are not in the same place on xAxis and shared tooltip:
+                    if (isCloserX !== 0) {
+                        return isCloserX;
+                    }
+                    // Points are not exactly in the same place on x/yAxis:
+                    if (isCloser !== 0) {
+                        return isCloser;
                     }
+                    // The same xAxis and yAxis position, sort by z-index:
+                    return isAbove;
                 });
             }
 
@@ -10359,37 +10437,43 @@
             if (shared) {
                 i = kdpoints.length;
                 while (i--) {
-                    if (kdpoints[i].clientX !== kdpoint[1].clientX || kdpoints[i].series.noSharedTooltip) {
+                    if (kdpoints[i].clientX !== kdpoints[0].clientX || kdpoints[i].series.noSharedTooltip) {
                         kdpoints.splice(i, 1);
                     }
                 }
             }
 
             // Refresh tooltip for kdpoint if new hover point or tooltip was hidden // #3926, #4200
-            if (kdpoint[0] && (kdpoint[0] !== this.prevKDPoint || (tooltip && tooltip.isHidden))) {
+            if (kdpoints[0] && (kdpoints[0] !== pointer.hoverPoint || (tooltip && tooltip.isHidden))) {
                 // Draw tooltip if necessary
-                if (shared && !kdpoint[0].series.noSharedTooltip) {
+                if (shared && !kdpoints[0].series.noSharedTooltip) {
+                    // Do mouseover on all points (#3919, #3985, #4410)
+                    for (i = 0; i >= 0; i--) {
+                        kdpoints[i].onMouseOver(e, kdpoints[i] !== ((hoverSeries && hoverSeries.directTouch && hoverPoint) || kdpoints[0]));
+                    }
+                    // Make sure that the hoverPoint and hoverSeries are stored for events (e.g. click), #5622
+                    if (hoverSeries && hoverSeries.directTouch && hoverPoint && hoverPoint !== kdpoints[0]) {
+                        hoverPoint.onMouseOver(e, false);
+                    }
                     if (kdpoints.length && tooltip) {
-                        tooltip.refresh(kdpoints, e);
+                        // Keep the order of series in tooltip:
+                        tooltip.refresh(kdpoints.sort(function (p1, p2) {
+                            return p1.series.index - p2.series.index;
+                        }), e);
                     }
-
-                    // Do mouseover on all points (#3919, #3985, #4410)
-                    each(kdpoints, function (point) {
-                        point.onMouseOver(e, point !== ((hoverSeries && hoverSeries.directTouch && hoverPoint) || kdpoint[0]));
-                    });
-                    this.prevKDPoint = kdpoint[1];
                 } else {
                     if (tooltip) {
-                        tooltip.refresh(kdpoint[0], e);
+                        tooltip.refresh(kdpoints[0], e);
                     }
                     if (!hoverSeries || !hoverSeries.directTouch) { // #4448
-                        kdpoint[0].onMouseOver(e);
+                        kdpoints[0].onMouseOver(e);
                     }
-                    this.prevKDPoint = kdpoint[0];
                 }
-
+                pointer.prevKDPoint = kdpoints[0];
+                updatePosition = false;
+            }
             // Update positions (regardless of kdpoint or hoverPoint)
-            } else {
+            if (updatePosition) {
                 followPointer = hoverSeries && hoverSeries.tooltipOptions.followPointer;
                 if (tooltip && followPointer && !tooltip.isHidden) {
                     anchor = tooltip.getAnchor([{}], e);
@@ -10409,10 +10493,10 @@
 
             // Crosshair. For each hover point, loop over axes and draw cross if that point
             // belongs to the axis (#4927).
-            each(shared ? kdpoints : [pick(hoverPoint, kdpoint[1])], function (point) { // #5269
-                each(chart.axes, function (axis) {
+            each(shared ? kdpoints : [pick(hoverPoint, kdpoints[0])], function drawPointCrosshair(point) { // #5269
+                each(chart.axes, function drawAxisCrosshair(axis) {
                     // In case of snap = false, point is undefined, and we draw the crosshair anyway (#5066)
-                    if (!point || point.series[axis.coll] === axis) {
+                    if (!point || point.series && point.series[axis.coll] === axis) { // #5658
                         axis.drawCrosshair(e, point);
                     }
                 });
@@ -12297,6 +12381,7 @@
 
                     // set axes scales
                     each(axes, function (axis) {
+                        axis.updateNames();
                         axis.setScale();
                     });
                 }
@@ -12589,7 +12674,9 @@
             // Destroy the clone and bring the container back to the real renderTo div
             if (revert) {
                 if (clone) {
-                    this.renderTo.appendChild(container);
+                    while (clone.childNodes.length) { // #5231
+                        this.renderTo.appendChild(clone.firstChild);
+                    }
                     discardElement(clone);
                     delete this.renderToClone;
                 }
@@ -13143,7 +13230,7 @@
                     } else {
                         linkedTo = chart.get(linkedTo);
                     }
-                    if (linkedTo) {
+                    if (linkedTo && linkedTo.linkedParent !== series) { // #3341 avoid mutual linking
                         linkedTo.linkedSeries.push(series);
                         series.linkedParent = linkedTo;
                         series.visible = pick(series.options.visible, linkedTo.options.visible, series.visible); // #3879
@@ -13574,14 +13661,25 @@
             extend(point, options);
             point.options = point.options ? extend(point.options, options) : options;
 
+            // Since options are copied into the Point instance, some accidental options must be shielded (#5681)
+            if (options.group) {
+                delete point.group;
+            }
+
             // For higher dimension series types. For instance, for ranges, point.y is mapped to point.low.
             if (pointValKey) {
                 point.y = point[pointValKey];
             }
-            point.isNull = point.x === null || !isNumber(point.y, true); // #3571, check for NaN
+            point.isNull = pick(
+                point.isValid && !point.isValid(),
+                point.x === null || !isNumber(point.y, true)
+            ); // #3571, check for NaN
 
             // If no x is set by now, get auto incremented value. All points must have an
             // x value, however the y value can be null to create a gap in the series
+            if ('name' in point && x === undefined && series.xAxis && series.xAxis.hasNames) {
+                point.x = series.xAxis.nameToX(point);
+            }
             if (point.x === undefined && series) {
                 if (x === undefined) {
                     point.x = series.autoIncrement(point);
@@ -13589,12 +13687,7 @@
                     point.x = x;
                 }
             }
-
-            // Write the last point's name to the names array
-            if (series.xAxis && series.xAxis.names) {
-                series.xAxis.names[point.x] = point.name;
-            }
-
+        
             return point;
         },
 
@@ -13780,7 +13873,8 @@
             fireEvent(this, eventType, eventArgs, defaultFunction);
         },
         visible: true
-    };/**
+    };
+    /**
      * @classDescription The base function which all other series types inherit from. The data in the series is stored
      * in various arrays.
      *
@@ -13959,38 +14053,18 @@
          * Return an auto incremented x value based on the pointStart and pointInterval options.
          * This is only used if an x value is not given for the point that calls autoIncrement.
          */
-        autoIncrement: function (point) {
+        autoIncrement: function () {
 
             var options = this.options,
                 xIncrement = this.xIncrement,
                 date,
                 pointInterval,
-                pointIntervalUnit = options.pointIntervalUnit,
-                xAxis = this.xAxis,
-                explicitCategories,
-                names,
-                nameX;
+                pointIntervalUnit = options.pointIntervalUnit;
 
             xIncrement = pick(xIncrement, options.pointStart, 0);
 
             this.pointInterval = pointInterval = pick(this.pointInterval, options.pointInterval, 1);
 
-            // When a point name is given and no x, search for the name in the existing categories,
-            // or if categories aren't provided, search names or create a new category (#2522).
-            if (xAxis && xAxis.categories && point.name) {
-                this.requireSorting = false;
-                explicitCategories = isArray(xAxis.categories);
-                names = explicitCategories ? xAxis.categories : xAxis.names;
-                nameX = inArray(point.name, names); // #2522
-                if (nameX === -1) { // The name is not found in currenct categories
-                    if (!explicitCategories) {
-                        xIncrement = names.length;
-                    }
-                } else {
-                    xIncrement = nameX;
-                }
-            }
-
             // Added code for pointInterval strings
             if (pointIntervalUnit) {
                 date = new Date(xIncrement);
@@ -14178,15 +14252,10 @@
 
 
                     if (isNumber(firstPoint)) { // assume all points are numbers
-                        var x = pick(options.pointStart, 0),
-                            pointInterval = pick(options.pointInterval, 1);
-
                         for (i = 0; i < dataLength; i++) {
-                            xData[i] = x;
+                            xData[i] = this.autoIncrement();
                             yData[i] = data[i];
-                            x += pointInterval;
                         }
-                        series.xIncrement = x;
                     } else if (isArray(firstPoint)) { // assume all points are arrays
                         if (valueCount) { // [x, low, high] or [x, o, h, l, c]
                             for (i = 0; i < dataLength; i++) {
@@ -14465,7 +14534,7 @@
 
                 // For points within the visible range, including the first point outside the
                 // visible range, consider y extremes
-                validValue = y !== null && y !== UNDEFINED && (!yAxis.isLog || (y.length || y > 0));
+                validValue = (isNumber(y, true) || isArray(y)) && (!yAxis.isLog || (y.length || y > 0));
                 withinRange = this.getExtremesFromAll || this.options.getExtremesFromAll || this.cropped ||
                     ((xData[i + 1] || x) >= xMin &&    (xData[i - 1] || x) <= xMax);
 
@@ -14528,8 +14597,7 @@
 
                 // Discard disallowed y values for log axes (#3434)
                 if (yAxis.isLog && yValue !== null && yValue <= 0) {
-                    point.y = yValue = null;
-                    error(10);
+                    point.isNull = true;
                 }
 
                 // Get the plotX translation
@@ -14580,7 +14648,7 @@
 
 
                 // Set client related positions for mouse tracking
-                point.clientX = dynamicallyPlaced ? correctFloat(xAxis.translate(xValue, 0, 0, 0, 1)) : plotX; // #1514
+                point.clientX = dynamicallyPlaced ? correctFloat(xAxis.translate(xValue, 0, 0, 0, 1, pointPlacement)) : plotX; // #1514, #5383, #5518
 
                 point.negative = point.y < (threshold || 0);
 
@@ -14685,14 +14753,9 @@
             var series = this,
                 chart = series.chart,
                 clipRect,
-                animation = series.options.animation,
+                animation = animObject(series.options.animation),
                 sharedClipKey;
 
-            // Animation option is set to true
-            if (animation && !isObject(animation)) {
-                animation = defaultPlotOptions[series.type].animation;
-            }
-
             // Initialize the animation. Set up the clipping rectangle.
             if (init) {
 
@@ -15262,15 +15325,17 @@
                 chartSizeMax = mathMax(chart.chartWidth, chart.chartHeight),
                 axis = this[(this.zoneAxis || 'y') + 'Axis'],
                 extremes,
-                reversed = axis.reversed,
+                reversed,
                 inverted = chart.inverted,
-                horiz = axis.horiz,
+                horiz,
                 pxRange,
                 pxPosMin,
                 pxPosMax,
                 ignoreZones = false;
 
-            if (zones.length && (graph || area) && axis.min !== UNDEFINED) {
+            if (zones.length && (graph || area) && axis && axis.min !== UNDEFINED) {
+                reversed = axis.reversed;
+                horiz = axis.horiz;
                 // The use of the Color Threshold assumes there are no gaps
                 // so it is safe to hide the original graph and area
                 if (graph) {
@@ -15320,7 +15385,7 @@
                     }
 
                     /// VML SUPPPORT
-                    if (chart.inverted && renderer.isVML) {
+                    if (inverted && renderer.isVML) {
                         if (axis.isXAxis) {
                             clipAttr = {
                                 x: 0,
@@ -16268,8 +16333,7 @@
                 graphic = point.graphic,
                 i,
                 chart = series.chart,
-                seriesOptions = series.options,
-                names = series.xAxis && series.xAxis.names;
+                seriesOptions = series.options;
 
             redraw = pick(redraw, true);
 
@@ -16299,10 +16363,7 @@
                 // record changes in the parallel arrays
                 i = point.index;
                 series.updateParallelArrays(point, i);
-                if (names && point.name) {
-                    names[point.x] = point.name;
-                }
-
+            
                 // Record the options to options.data. If there is an object from before,
                 // use point options, otherwise use raw options. (#4701)
                 seriesOptions.data[i] = isObject(seriesOptions.data[i], true) ? point.options : options;
@@ -16364,8 +16425,6 @@
                 i,
                 x;
 
-            setAnimation(animation, chart);
-
             // Optional redraw, defaults to true
             redraw = pick(redraw, true);
 
@@ -16417,9 +16476,10 @@
             // redraw
             series.isDirty = true;
             series.isDirtyData = true;
+
             if (redraw) {
                 series.getAttribs(); // #1937
-                chart.redraw();
+                chart.redraw(animation); // Animation is set anyway on redraw, #5665
             }
         },
 
@@ -16472,12 +16532,11 @@
          * @param {Boolean|Object} animation Whether to apply animation, and optionally animation
          *    configuration
          */
-        remove: function (redraw, animation) {
+        remove: function (redraw, animation, withEvent) {
             var series = this,
                 chart = series.chart;
 
-            // Fire the event with a default handler of removing the point
-            fireEvent(series, 'remove', null, function () {
+            function remove() {
 
                 // Destroy elements
                 series.destroy();
@@ -16489,7 +16548,14 @@
                 if (pick(redraw, true)) {
                     chart.redraw(animation);
                 }
-            });
+            }
+
+            // Fire the event with a default handler of removing the point
+            if (withEvent !== false) {
+                fireEvent(series, 'remove', null, remove);
+            } else {
+                remove();
+            }
         },
 
         /**
@@ -16526,7 +16592,7 @@
 
             // Destroy the series and delete all properties. Reinsert all methods
             // and properties from the new type prototype (#2270, #3719)
-            this.remove(false);
+            this.remove(false, null, false);
             for (n in proto) {
                 this[n] = UNDEFINED;
             }
@@ -16811,14 +16877,14 @@
                         });
                         bottomPoints.push({
                             plotX: plotX,
-                            plotY: bottom === null ? translatedThreshold : yAxis.getThreshold(bottom)
+                            plotY: bottom === null ? translatedThreshold : yAxis.getThreshold(bottom),
+                            doCurve: false // #1041, gaps in areaspline areas
                         });
                     }
                 };
 
             // Find what points to use
             points = points || this.points;
-
         
             // Fill in missing points
             if (stacking) {
@@ -16949,8 +17015,12 @@
                 rightContY,
                 ret;
 
+            function doCurve(otherPoint) {
+                return otherPoint && !otherPoint.isNull && otherPoint.doCurve !== false;
+            }
+
             // Find control points
-            if (lastPoint && !lastPoint.isNull && nextPoint && !nextPoint.isNull) {
+            if (doCurve(lastPoint) && doCurve(nextPoint)) {
                 var lastX = lastPoint.plotX,
                     lastY = lastPoint.plotY,
                     nextX = nextPoint.plotX,
@@ -17001,29 +17071,35 @@
                 this.chart.renderer.circle(leftContX + this.chart.plotLeft, leftContY + this.chart.plotTop, 2)
                     .attr({
                         stroke: 'red',
-                        'stroke-width': 1,
-                        fill: 'none'
+                        'stroke-width': 2,
+                        fill: 'none',
+                        zIndex: 9
                     })
                     .add();
                 this.chart.renderer.path(['M', leftContX + this.chart.plotLeft, leftContY + this.chart.plotTop,
                     'L', plotX + this.chart.plotLeft, plotY + this.chart.plotTop])
                     .attr({
                         stroke: 'red',
-                        'stroke-width': 1
+                        'stroke-width': 2,
+                        zIndex: 9
                     })
                     .add();
+            }
+            if (rightContX) {
                 this.chart.renderer.circle(rightContX + this.chart.plotLeft, rightContY + this.chart.plotTop, 2)
                     .attr({
                         stroke: 'green',
-                        'stroke-width': 1,
-                        fill: 'none'
+                        'stroke-width': 2,
+                        fill: 'none',
+                        zIndex: 9
                     })
                     .add();
                 this.chart.renderer.path(['M', rightContX + this.chart.plotLeft, rightContY + this.chart.plotTop,
                     'L', plotX + this.chart.plotLeft, plotY + this.chart.plotTop])
                     .attr({
                         stroke: 'green',
-                        'stroke-width': 1
+                        'stroke-width': 2,
+                        zIndex: 9
                     })
                     .add();
             }
@@ -17316,7 +17392,12 @@
 
                 // Register shape type and arguments to be used in drawPoints
                 point.shapeType = 'rect';
-                point.shapeArgs = series.crispCol(barX, barY, barW, barH);
+                point.shapeArgs = series.crispCol.apply(
+                    series,
+                    point.isNull ? 
+                        [point.plotX, yAxis.len / 2, 0, 0] : // #3169, drilldown from null must have a position to work from
+                        [barX, barY, barW, barH]
+                );
             });
 
         },
@@ -19643,7 +19724,7 @@
                 oldVisibility = series.visible;
 
             // if called without an argument, toggle visibility
-            series.visible = vis = series.userOptions.visible = vis === UNDEFINED ? !oldVisibility : vis;
+            series.visible = vis = series.options.visible = series.userOptions.visible = vis === undefined ? !oldVisibility : vis; // #5618
             showOrHide = vis ? 'show' : 'hide';
 
             // show or hide elements