highcharts-rails 5.0.9 → 5.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a1203f405bffad4bc97bdeb40025f1d32aa9d035
-  data.tar.gz: 7c4d64d7ccfef934a1d562ba18c28e6e8756f8dd
+  metadata.gz: 4d9fce6a4b9deae4055a42cc56e54f4cab837e50
+  data.tar.gz: 83880957c3ae435a500132e2b95e5a9d8a5d2ea8
 SHA512:
-  metadata.gz: 7487bf84bcb2f7d8d540afc53341be646fce318ba69a48a6517e9f41ed3e2c38f28d0883bb4332a78423297fca542c77b061b69abbff6dca2556e8799508dcbc
-  data.tar.gz: 4a587287886f11f7d3816f424174b3fea4a0a108655b849b2d4c5fb2fe0d3898dfda781c465c29a80b98a914549357fa90e0937072abc5238db25ca9e2907d8f
+  metadata.gz: 9c4eebee732b136ebf348a290b09286ab798f435e65c70a24ead95dbf596d6b1c15a7c80afd6a4e3f1796fa332d3b4b31d80597dd874b23699ad7b74cad1c515
+  data.tar.gz: 22bc411c05e562ff3404f8f76e282bc4a8663257abd1719880757c7ea601454f5af680a7e1487cec7a05d5a5e222af1d2b9aeea777931f65f6a22e49bc2b87dd

data/CHANGELOG.markdown

@@ -1,3 +1,51 @@
+# 5.0.10 / 2017-11-10
+
+* Updated Highcharts to 5.0.10 (2017-03-31)
+  * Added !default statement to SASS variables for easier configuration. Closes #6436.
+  * Added new option, plotOptions.column.crisp, to allow disabling crisp columns and subsequent rendering issues with densely packed items. Closes #5755.
+  * Added new option, findNearestPointBy to declare how the tooltip searches for points. #6231.
+  * Refactored the Pane object to keep track of its own backgrounds, more decoupled from Axis.
+  * Bug fixes
+    * Fixed #3481, title and subtitle were not resizing chart correctly when using useHTML on true.
+    * Fixed #3936, colorAxis was not updated through chart.update.
+    * Fixed #4964, missing plotband when small range.
+    * Fixed #6007, exporting after chart.update() threw errors.
+    * Fixed #6144, empty categories caused wrong render of tooltip.
+    * Fixed #6191, dead clip path references.
+    * Fixed #6203, yAxis extremes were wrong calculated for visible scatter points
+    * Fixed #6258, text labels with ellipsis had inconsistent behavior.
+    * Fixed #6279, error when hiding series of line polar using data module.
+    * Fixed #6359, softMin/softMax didn't work in combination with floor/ceiling.
+    * Fixed #6430, areasplinerange polar curve path was wrongly rendered.
+    * Fixed #6431, addition to #6476, stickyTracking should default to true when there is a shared tooltip.
+    * Fixed #6433, updating Axis with plotBands rendered redundant nodes.
+    * Fixed #6437, 3D pie chart disappeared when drilling down after resize.
+    * Fixed #6444, exporting the second time failed with axis extremes.
+    * Fixed #6449, series with noSharedTooltip was inaccessible with shared tooltip.
+    * Fixed #6452, chart.update was not redrawing axes when setting alignTicks to false.
+    * Fixed #6456, tooltip didn't show on hovering outside candlestick and OHLC series.
+    * Fixed #6458, named color deduction was case sensitive.
+    * Fixed #6459, colors of boxplot series points would not update.
+    * Fixed #6463, missing closing sign in RegEx caused wrong handling of pseudo attributes.
+    * Fixed #6465, first data label in polar charts was not visible.
+    * Fixed #6469, series got lost when mixing category data in a dual axis chart.
+    * Fixed #6470, exporting failed in IE8 when data labels were enabled.
+    * Fixed #6473, wrong text wrapping with textOutline: none.
+    * Fixed #6474, custom CSS property was injected into the DOM. Added to blacklist.
+    * Fixed #6474, text outlines were not properly cleaned up on resizing.
+    * Fixed #6476, shared tooltip with disabled stickyTracking did not work.
+    * Fixed #6477, regression on crosshairs with snap in a bubble chart.
+    * Fixed #6479, responsive rules didn't apply to panes.
+    * Fixed #6481, offline export of pie charts to PDF not working in Firefox and Safari.
+    * Fixed #6487, contrast color was not applied for a justified label on a column.
+    * Fixed #6497, horizontal legend layout didn't respect spacing setting.
+    * Fixed #6499, offline export fails with allowHTML despite no HTML in chart.
+    * Fixed #6502, missing chart series and axis in combined logarithmic chart.
+    * Fixed #6518, wrong marker positions when hovering after redrawing in boost module.
+    * Fixed #6519, empty space caused overlapping in legend.
+    * Fixed #6521, missing label for narrow plot band.
+    * * Fixed #6089, chart.update not taking effect on panes. Also closes #6438.
+
 # 5.0.9 / 2017-11-10
 
 * Updated Highcharts to 5.0.9 (2017-03-08)

data/app/assets/javascripts/highcharts.js

@@ -1,5 +1,5 @@
 /**
- * @license Highcharts JS v5.0.9 (2017-03-08)
+ * @license Highcharts JS v5.0.10 (2017-03-31)
  *
  * (c) 2009-2016 Torstein Honsi
  *
@@ -17,7 +17,7 @@
 }(typeof window !== 'undefined' ? window : this, function(win) {
     var Highcharts = (function() {
         /**
-         * (c) 2010-2016 Torstein Honsi
+         * (c) 2010-2017 Torstein Honsi
          *
          * License: www.highcharts.com/license
          */
@@ -35,7 +35,7 @@
 
         var Highcharts = win.Highcharts ? win.Highcharts.error(16, true) : {
             product: 'Highcharts',
-            version: '5.0.9',
+            version: '5.0.10',
             deg2rad: Math.PI * 2 / 360,
             doc: doc,
             hasBidiBug: hasBidiBug,
@@ -61,7 +61,7 @@
     }());
     (function(H) {
         /**
-         * (c) 2010-2016 Torstein Honsi
+         * (c) 2010-2017 Torstein Honsi
          *
          * License: www.highcharts.com/license
          */
@@ -2091,7 +2091,7 @@
     }(Highcharts));
     (function(H) {
         /**
-         * (c) 2010-2016 Torstein Honsi
+         * (c) 2010-2017 Torstein Honsi
          *
          * License: www.highcharts.com/license
          */
@@ -2139,8 +2139,8 @@
                 }
             }],
 
-            // Collection of named colors. Can be extended from the outside by adding colors
-            // to Highcharts.Color.prototype.names.
+            // Collection of named colors. Can be extended from the outside by adding
+            // colors to Highcharts.Color.prototype.names.
             names: {
                 white: '#ffffff',
                 black: '#000000'
@@ -2157,7 +2157,11 @@
                     parser,
                     len;
 
-                this.input = input = this.names[input] || input;
+                this.input = input = this.names[
+                    input && input.toLowerCase ?
+                    input.toLowerCase() :
+                    ''
+                ] || input;
 
                 // Gradients
                 if (input && input.stops) {
@@ -2288,7 +2292,7 @@
     }(Highcharts));
     (function(H) {
         /**
-         * (c) 2010-2016 Torstein Honsi
+         * (c) 2010-2017 Torstein Honsi
          *
          * License: www.highcharts.com/license
          */
@@ -2484,10 +2488,10 @@
                     value;
 
                 // Apply linear or radial gradients
-                if (color.linearGradient) {
-                    gradName = 'linearGradient';
-                } else if (color.radialGradient) {
+                if (color.radialGradient) {
                     gradName = 'radialGradient';
+                } else if (color.linearGradient) {
+                    gradName = 'linearGradient';
                 }
 
                 if (gradName) {
@@ -2508,9 +2512,14 @@
                     }
 
                     // Correct the radial gradient for the radial reference system
-                    if (gradName === 'radialGradient' && radialReference && !defined(gradAttr.gradientUnits)) {
+                    if (
+                        gradName === 'radialGradient' &&
+                        radialReference &&
+                        !defined(gradAttr.gradientUnits)
+                    ) {
                         radAttr = gradAttr; // Save the radial attributes for updating
-                        gradAttr = merge(gradAttr,
+                        gradAttr = merge(
+                            gradAttr,
                             renderer.getRadialAttr(radialReference, radAttr), {
                                 gradientUnits: 'userSpaceOnUse'
                             }
@@ -2599,11 +2608,13 @@
             applyTextOutline: function(textOutline) {
                 var elem = this.element,
                     tspans,
+                    tspan,
                     hasContrast = textOutline.indexOf('contrast') !== -1,
                     styles = {},
                     color,
                     strokeWidth,
-                    firstRealChild;
+                    firstRealChild,
+                    i;
 
                 // When the text shadow is set to contrast, use dark stroke for light
                 // text and vice versa.
@@ -2614,20 +2625,20 @@
                     );
                 }
 
-                this.fakeTS = true; // Fake text shadow
-
-                // In order to get the right y position of the clone,
-                // copy over the y setter
-                this.ySetter = this.xSetter;
-
-                tspans = [].slice.call(elem.getElementsByTagName('tspan'));
-
                 // Extract the stroke width and color
                 textOutline = textOutline.split(' ');
                 color = textOutline[textOutline.length - 1];
                 strokeWidth = textOutline[0];
 
-                if (strokeWidth && strokeWidth !== 'none') {
+                if (strokeWidth && strokeWidth !== 'none' && H.svg) {
+
+                    this.fakeTS = true; // Fake text shadow
+
+                    tspans = [].slice.call(elem.getElementsByTagName('tspan'));
+
+                    // In order to get the right y position of the clone,
+                    // copy over the y setter
+                    this.ySetter = this.xSetter;
 
                     // Since the stroke is applied on center of the actual outline, we
                     // need to double it to get the correct stroke-width outside the 
@@ -2639,13 +2650,16 @@
                         }
                     );
 
-                    // Remove shadows from previous runs
-                    each(tspans, function(tspan) {
+                    // Remove shadows from previous runs. Iterate from the end to
+                    // support removing items inside the cycle (#6472).
+                    i = tspans.length;
+                    while (i--) {
+                        tspan = tspans[i];
                         if (tspan.getAttribute('class') === 'highcharts-text-outline') {
                             // Remove then erase
                             erase(tspans, elem.removeChild(tspan));
                         }
-                    });
+                    }
 
                     // For each of the tspans, create a stroked copy behind it.
                     firstRealChild = elem.firstChild;
@@ -2769,7 +2783,12 @@
                             stop(this, key);
                         }
 
-                        if (this.symbolName && /^(x|y|width|height|r|start|end|innerR|anchorX|anchorY)/.test(key)) {
+                        // Special handling of symbol attributes
+                        if (
+                            this.symbolName &&
+                            /^(x|y|width|height|r|start|end|innerR|anchorX|anchorY)$/
+                            .test(key)
+                        ) {
                             if (!hasSetSymbolSize) {
                                 this.symbolAttr(hash);
                                 hasSetSymbolSize = true;
@@ -2986,8 +3005,8 @@
                     // These CSS properties are interpreted internally by the SVG
                     // renderer, but are not supported by SVG and should not be added to
                     // the DOM. In styled mode, no CSS should find its way to the DOM
-                    // whatsoever (#6173).
-                    svgPseudoProps = ['textOverflow', 'width'];
+                    // whatsoever (#6173, #6474).
+                    svgPseudoProps = ['textOutline', 'textOverflow', 'width'];
 
                 // convert legacy
                 if (styles && styles.color) {
@@ -3619,6 +3638,17 @@
                 stop(wrapper); // stop running animations
 
                 if (wrapper.clipPath) {
+                    // Look for existing references to this clipPath and remove them
+                    // before destroying the element (#6196).
+                    each(
+                        wrapper.element.ownerSVGElement.querySelectorAll('[clip-path]'),
+                        function(el) {
+                            if (el.getAttribute('clip-path')
+                                .indexOf(wrapper.clipPath.element.id) > -1) {
+                                el.removeAttribute('clip-path');
+                            }
+                        }
+                    );
                     wrapper.clipPath = wrapper.clipPath.destroy();
                 }
 
@@ -4061,7 +4091,7 @@
 
                 // Add description
                 desc = this.createElement('desc').add();
-                desc.element.appendChild(doc.createTextNode('Created with Highcharts 5.0.9'));
+                desc.element.appendChild(doc.createTextNode('Created with Highcharts 5.0.10'));
 
 
                 renderer.defs = this.createElement('defs').add();
@@ -4208,6 +4238,58 @@
                 };
             },
 
+            getSpanWidth: function(wrapper, tspan) {
+                var renderer = this,
+                    bBox = wrapper.getBBox(true),
+                    actualWidth = bBox.width;
+
+                // Old IE cannot measure the actualWidth for SVG elements (#2314)
+                if (!svg && renderer.forExport) {
+                    actualWidth = renderer.measureSpanWidth(tspan.firstChild.data, wrapper.styles);
+                }
+                return actualWidth;
+            },
+
+            applyEllipsis: function(wrapper, tspan, text, width) {
+                var renderer = this,
+                    actualWidth = renderer.getSpanWidth(wrapper, tspan),
+                    wasTooLong = actualWidth > width,
+                    str = text,
+                    currentIndex,
+                    minIndex = 0,
+                    maxIndex = text.length,
+                    updateTSpan = function(s) {
+                        tspan.removeChild(tspan.firstChild);
+                        if (s) {
+                            tspan.appendChild(doc.createTextNode(s));
+                        }
+                    };
+                if (wasTooLong) {
+                    while (minIndex <= maxIndex) {
+                        currentIndex = Math.ceil((minIndex + maxIndex) / 2);
+                        str = text.substring(0, currentIndex) + '\u2026';
+                        updateTSpan(str);
+                        actualWidth = renderer.getSpanWidth(wrapper, tspan);
+                        if (minIndex === maxIndex) {
+                            // Complete
+                            minIndex = maxIndex + 1;
+                        } else if (actualWidth > width) {
+                            // Too large. Set max index to current.
+                            maxIndex = currentIndex - 1;
+                        } else {
+                            // Within width. Set min index to current.
+                            minIndex = currentIndex;
+                        }
+                    }
+                    // If max index was 0 it means just ellipsis was also to large.
+                    if (maxIndex === 0) {
+                        // Remove ellipses.
+                        updateTSpan('');
+                    }
+                }
+                return wasTooLong;
+            },
+
             /**
              * Parse a simple HTML string into SVG tspans. Called internally when text
              *   is set on an SVGElement. The function supports a subset of HTML tags,
@@ -4237,6 +4319,7 @@
                     noWrap = textStyles && textStyles.whiteSpace === 'nowrap',
                     fontSize = textStyles && textStyles.fontSize,
                     textCache,
+                    isSubsequentLine,
                     i = childNodes.length,
                     tempParent = width && !wrapper.added && this.box,
                     getLineHeight = function(tspan) {
@@ -4371,7 +4454,7 @@
                                     textNode.appendChild(tspan);
 
                                     // first span on subsequent line, add the line height
-                                    if (!spanNo && lineNo) {
+                                    if (!spanNo && isSubsequentLine) {
 
                                         // allow getting the right offset height in exporting in IE
                                         if (!svg && forExport) {
@@ -4398,44 +4481,28 @@
                                         var words = span.replace(/([^\^])-/g, '$1- ').split(' '), // #1273
                                             hasWhiteSpace = spans.length > 1 || lineNo || (words.length > 1 && !noWrap),
                                             tooLong,
-                                            actualWidth,
                                             rest = [],
+                                            actualWidth,
                                             dy = getLineHeight(tspan),
-                                            rotation = wrapper.rotation,
-                                            wordStr = span, // for ellipsis
-                                            cursor = wordStr.length, // binary search cursor
-                                            bBox;
+                                            rotation = wrapper.rotation;
 
-                                        while ((hasWhiteSpace || ellipsis) && (words.length || rest.length)) {
-                                            wrapper.rotation = 0; // discard rotation when computing box
-                                            bBox = wrapper.getBBox(true);
-                                            actualWidth = bBox.width;
-
-                                            // Old IE cannot measure the actualWidth for SVG elements (#2314)
-                                            if (!svg && renderer.forExport) {
-                                                actualWidth = renderer.measureSpanWidth(tspan.firstChild.data, wrapper.styles);
-                                            }
+                                        if (ellipsis) {
+                                            wasTooLong = renderer.applyEllipsis(wrapper, tspan, span, width);
+                                        }
 
+                                        while (!ellipsis && hasWhiteSpace && (words.length || rest.length)) {
+                                            wrapper.rotation = 0; // discard rotation when computing box
+                                            actualWidth = renderer.getSpanWidth(wrapper, tspan);
                                             tooLong = actualWidth > width;
 
                                             // For ellipsis, do a binary search for the correct string length
                                             if (wasTooLong === undefined) {
                                                 wasTooLong = tooLong; // First time
                                             }
-                                            if (ellipsis && wasTooLong) {
-                                                cursor /= 2;
-
-                                                if (wordStr === '' || (!tooLong && cursor < 0.5)) {
-                                                    words = []; // All ok, break out
-                                                } else {
-                                                    wordStr = span.substring(0, wordStr.length + (tooLong ? -1 : 1) * Math.ceil(cursor));
-                                                    words = [wordStr + (width > 3 ? '\u2026' : '')];
-                                                    tspan.removeChild(tspan.firstChild);
-                                                }
 
-                                                // Looping down, this is the first word sequence that is not too long,
-                                                // so we can move on to build the next line.
-                                            } else if (!tooLong || words.length === 1) {
+                                            // Looping down, this is the first word sequence that is not too long,
+                                            // so we can move on to build the next line.
+                                            if (!tooLong || words.length === 1) {
                                                 words = rest;
                                                 rest = [];
 
@@ -4468,6 +4535,8 @@
                                 }
                             }
                         });
+                        // To avoid beginning lines that doesn't add to the textNode (#6144)
+                        isSubsequentLine = isSubsequentLine || textNode.childNodes.length;
                     });
 
                     if (wasTooLong) {
@@ -5807,7 +5876,7 @@
     }(Highcharts));
     (function(H) {
         /**
-         * (c) 2010-2016 Torstein Honsi
+         * (c) 2010-2017 Torstein Honsi
          *
          * License: www.highcharts.com/license
          */
@@ -6169,7 +6238,7 @@
     }(Highcharts));
     (function(H) {
         /**
-         * (c) 2010-2016 Torstein Honsi
+         * (c) 2010-2017 Torstein Honsi
          *
          * License: www.highcharts.com/license
          */
@@ -7320,7 +7389,7 @@
     }(Highcharts));
     (function(H) {
         /**
-         * (c) 2010-2016 Torstein Honsi
+         * (c) 2010-2017 Torstein Honsi
          *
          * License: www.highcharts.com/license
          */
@@ -7366,7 +7435,7 @@
                 useUTC: true,
                 //timezoneOffset: 0,
 
-                VMLRadialGradientURL: 'http://code.highcharts.com/5.0.9/gfx/vml-radial-gradient.png'
+                VMLRadialGradientURL: 'http://code.highcharts.com/5.0.10/gfx/vml-radial-gradient.png'
 
             },
             chart: {
@@ -7708,7 +7777,7 @@
     }(Highcharts));
     (function(H) {
         /**
-         * (c) 2010-2016 Torstein Honsi
+         * (c) 2010-2017 Torstein Honsi
          *
          * License: www.highcharts.com/license
          */
@@ -7801,9 +7870,9 @@
                 groupAttribs.zIndex = zIndex;
                 groupName += '-' + zIndex;
 
-                group = axis[groupName];
+                group = axis.plotLinesAndBandsGroups[groupName];
                 if (!group) {
-                    axis[groupName] = group = renderer.g('plot-' + groupName)
+                    axis.plotLinesAndBandsGroups[groupName] = group = renderer.g('plot-' + groupName)
                         .attr(groupAttribs).add();
                 }
 
@@ -7956,19 +8025,26 @@
              */
             getPlotBandPath: function(from, to) {
                 var toPath = this.getPlotLinePath(to, null, null, true),
-                    path = this.getPlotLinePath(from, null, null, true);
+                    path = this.getPlotLinePath(from, null, null, true),
+                    // #4964 check if chart is inverted or plotband is on yAxis 
+                    horiz = this.horiz,
+                    plus = 1,
+                    outside =
+                    (from < this.min && to < this.min) ||
+                    (from > this.max && to > this.max);
 
                 if (path && toPath) {
 
                     // Flat paths don't need labels (#3836)
-                    path.flat = path.toString() === toPath.toString();
+                    if (outside) {
+                        path.flat = path.toString() === toPath.toString();
+                        plus = 0;
+                    }
 
+                    // Add 1 pixel, when coordinates are the same
                     path.push(
-                        toPath[4],
-                        toPath[5],
-                        toPath[1],
-                        toPath[2],
-                        'z' // #5909
+                        horiz && toPath[4] === path[4] ? toPath[4] + plus : toPath[4], !horiz && toPath[5] === path[5] ? toPath[5] + plus : toPath[5],
+                        horiz && toPath[1] === path[1] ? toPath[1] + plus : toPath[1], !horiz && toPath[2] === path[2] ? toPath[2] + plus : toPath[2]
                     );
                 } else { // outside the axis area
                     path = null;
@@ -8034,7 +8110,7 @@
     }(Highcharts));
     (function(H) {
         /**
-         * (c) 2010-2016 Torstein Honsi
+         * (c) 2010-2017 Torstein Honsi
          *
          * License: www.highcharts.com/license
          */
@@ -8544,7 +8620,7 @@
     }(Highcharts));
     (function(H) {
         /**
-         * (c) 2010-2016 Torstein Honsi
+         * (c) 2010-2017 Torstein Honsi
          *
          * License: www.highcharts.com/license
          */
@@ -8844,6 +8920,9 @@
                 //axis.axisTitle = undefined;
                 //axis.axisLine = undefined;
 
+                // Placeholder for plotlines and plotbands groups
+                axis.plotLinesAndBandsGroups = {};
+
                 // Shorthand types
                 axis.isLog = type === 'logarithmic';
                 axis.isDatetimeAxis = isDatetimeAxis;
@@ -9465,7 +9544,9 @@
                 }
 
                 // Write the last point's name to the names array
-                this.names[x] = point.name;
+                if (x !== undefined) {
+                    this.names[x] = point.name;
+                }
 
                 return x;
             },
@@ -9494,7 +9575,7 @@
                             var x;
                             if (point.options) {
                                 x = axis.nameToX(point);
-                                if (x !== point.x) {
+                                if (x !== undefined && x !== point.x) {
                                     point.x = x;
                                     series.xData[i] = x;
                                 }
@@ -9703,18 +9784,21 @@
                     }
                 }
 
-                // Handle options for floor, ceiling, softMin and softMax
+                // Handle options for floor, ceiling, softMin and softMax (#6359)
+                if (isNumber(options.softMin)) {
+                    axis.min = Math.min(axis.min, options.softMin);
+                }
+                if (isNumber(options.softMax)) {
+                    axis.max = Math.max(axis.max, options.softMax);
+                }
                 if (isNumber(options.floor)) {
                     axis.min = Math.max(axis.min, options.floor);
-                } else if (isNumber(options.softMin)) {
-                    axis.min = Math.min(axis.min, options.softMin);
                 }
                 if (isNumber(options.ceiling)) {
                     axis.max = Math.min(axis.max, options.ceiling);
-                } else if (isNumber(options.softMax)) {
-                    axis.max = Math.max(axis.max, options.softMax);
                 }
 
+
                 // When the threshold is soft, adjust the extreme value only if
                 // the data extreme and the padded extreme land on either side of the threshold. For example,
                 // a series of [0, 1, 2, 3] would make the yAxis add a tick for -1 because of the
@@ -9889,7 +9973,7 @@
                     minPointOffset = this.minPointOffset || 0;
 
                 if (!this.isLinked) {
-                    if (startOnTick) {
+                    if (startOnTick && roundedMin !== -Infinity) { // #6502
                         this.min = roundedMin;
                     } else {
                         while (this.min - minPointOffset > tickPositions[0]) {
@@ -11053,6 +11137,7 @@
                     stacks = axis.stacks,
                     stackKey,
                     plotLinesAndBands = axis.plotLinesAndBands,
+                    plotGroup,
                     i,
                     n;
 
@@ -11086,6 +11171,11 @@
                     }
                 });
 
+                // Destroy each generated group for plotlines and plotbands
+                for (plotGroup in axis.plotLinesAndBandsGroups) {
+                    axis.plotLinesAndBandsGroups[plotGroup] = axis.plotLinesAndBandsGroups[plotGroup].destroy();
+                }
+
                 // Delete all properties and fall back to the prototype.
                 for (n in axis) {
                     if (axis.hasOwnProperty(n) && inArray(n, axis.keepProps) === -1) {
@@ -11203,7 +11293,7 @@
     }(Highcharts));
     (function(H) {
         /**
-         * (c) 2010-2016 Torstein Honsi
+         * (c) 2010-2017 Torstein Honsi
          *
          * License: www.highcharts.com/license
          */
@@ -11463,7 +11553,7 @@
     }(Highcharts));
     (function(H) {
         /**
-         * (c) 2010-2016 Torstein Honsi
+         * (c) 2010-2017 Torstein Honsi
          *
          * License: www.highcharts.com/license
          */
@@ -11586,7 +11676,7 @@
     }(Highcharts));
     (function(H) {
         /**
-         * (c) 2010-2016 Torstein Honsi
+         * (c) 2010-2017 Torstein Honsi
          *
          * License: www.highcharts.com/license
          */
@@ -12338,7 +12428,7 @@
     }(Highcharts));
     (function(H) {
         /**
-         * (c) 2010-2016 Torstein Honsi
+         * (c) 2010-2017 Torstein Honsi
          *
          * License: www.highcharts.com/license
          */
@@ -12497,8 +12587,11 @@
                     // Skip hidden series
                     noSharedTooltip = s.noSharedTooltip && shared;
                     directTouch = !shared && s.directTouch;
-                    if (s.visible && !noSharedTooltip && !directTouch && pick(s.options.enableMouseTracking, true)) { // #3821
-                        kdpointT = s.searchPoint(e, !noSharedTooltip && s.kdDimensions === 1); // #3828
+                    if (s.visible && !directTouch && pick(s.options.enableMouseTracking, true)) { // #3821
+                        // #3828
+                        kdpointT = s.searchPoint(
+                            e, !noSharedTooltip && s.options.findNearestPointBy.indexOf('y') < 0
+                        );
                         if (kdpointT && kdpointT.series) { // Point.series becomes null when reset and before redraw (#5197)
                             kdpoints.push(kdpointT);
                         }
@@ -12531,7 +12624,7 @@
                 });
 
                 // Remove points with different x-positions, required for shared tooltip and crosshairs (#4645):
-                if (shared) {
+                if (shared && kdpoints[0] && !kdpoints[0].series.noSharedTooltip) {
                     i = kdpoints.length;
                     while (i--) {
                         if (kdpoints[i].x !== kdpoints[0].x || kdpoints[i].series.noSharedTooltip) {
@@ -12553,9 +12646,9 @@
             },
 
             getHoverData: function(existingHoverPoint, existingHoverSeries, series, isDirectTouch, shared, e) {
-                var i,
-                    hoverPoint = existingHoverPoint,
+                var hoverPoint = existingHoverPoint,
                     hoverSeries = existingHoverSeries,
+                    searchSeries,
                     hoverPoints;
 
                 // If it has a hoverPoint and that series requires direct touch (like columns, #3899), or we're on
@@ -12587,29 +12680,28 @@
                     } else {
                         hoverPoints = [hoverPoint];
                     }
-                } else if (hoverSeries && !hoverSeries.options.stickyTracking) {
-                    hoverPoints = this.getKDPoints([hoverSeries], shared, e);
-                    hoverPoint = hoverPoints[0];
-                    hoverSeries = hoverPoint && hoverPoint.series;
-                } else {
+                    // When the hovered series has stickyTracking false.
+                } else if (hoverSeries && !hoverSeries.stickyTracking) {
                     if (!shared) {
-                        // For hovering over the empty parts of the plot area (hoverSeries is undefined).
-                        // If there is one series with point tracking (combo chart), don't go to nearest neighbour.
-                        if (!hoverSeries) {
-                            for (i = 0; i < series.length; i++) {
-                                if (series[i].directTouch || !series[i].options.stickyTracking) {
-                                    series = [];
-                                }
-                            }
-                            // When we have non-shared tooltip and sticky tracking is disabled,
-                            // search for the closest point only on hovered series: #5533, #5476
-                        } else if (!hoverSeries.options.stickyTracking) {
-                            series = [hoverSeries];
-                        }
+                        series = [hoverSeries];
                     }
                     hoverPoints = this.getKDPoints(series, shared, e);
+                    hoverPoint = H.find(hoverPoints, function(p) {
+                        return p.series === hoverSeries;
+                    });
+                    // When the hoverSeries has stickyTracking or there is no series hovered.
+                } else {
+                    // Avoid series with stickyTracking
+                    searchSeries = H.grep(series, function(s) {
+                        return s.stickyTracking;
+                    });
+                    hoverPoints = this.getKDPoints(searchSeries, shared, e);
                     hoverPoint = hoverPoints[0];
                     hoverSeries = hoverPoint && hoverPoint.series;
+                    // If 
+                    if (shared) {
+                        hoverPoints = this.getKDPoints(series, shared, e);
+                    }
                 }
                 // Keep the order of series in tooltip
                 // Must be done after assigning of hoverPoint
@@ -12636,7 +12728,7 @@
                     hoverPoint = p || chart.hoverPoint,
                     hoverSeries = hoverPoint && hoverPoint.series || chart.hoverSeries,
                     // onMouseOver or already hovering a series with directTouch
-                    isDirectTouch = !!p || (hoverSeries && hoverSeries.directTouch),
+                    isDirectTouch = !!p || (!shared && hoverSeries && hoverSeries.directTouch),
                     hoverData = this.getHoverData(hoverPoint, hoverSeries, series, isDirectTouch, shared, e),
                     useSharedTooltip,
                     followPointer,
@@ -12648,7 +12740,10 @@
                 hoverSeries = hoverData.hoverSeries;
                 followPointer = hoverSeries && hoverSeries.tooltipOptions.followPointer;
                 useSharedTooltip = shared && hoverPoint && !hoverPoint.series.noSharedTooltip;
-                points = useSharedTooltip ? hoverData.hoverPoints : [hoverPoint];
+                points = (useSharedTooltip ?
+                    hoverData.hoverPoints :
+                    (hoverPoint ? [hoverPoint] : [])
+                );
 
                 // Refresh tooltip for kdpoint if new hover point or tooltip was hidden // #3926, #4200
                 if (
@@ -12703,15 +12798,20 @@
                     });
                 }
 
-                // Crosshair. For each hover point, loop over axes and draw cross if that point
-                // belongs to the axis (#4927).
-                each(points, 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 && point.series[axis.coll] === axis) { // #5658
-                            axis.drawCrosshair(e, point);
-                        }
-                    });
+                // Draw crosshairs (#4927, #5269 #5066, #5658)
+                each(chart.axes, function drawAxisCrosshair(axis) {
+                    // Snap is true. For each hover point, loop over the axes and draw a
+                    // crosshair if that point belongs to the axis.
+                    // @todo Consider only one crosshair per axis.
+                    if (pick(axis.crosshair.snap, true)) {
+                        each(points, function(p) {
+                            if (p.series[axis.coll] === axis) {
+                                axis.drawCrosshair(e, p);
+                            }
+                        });
+                    } else {
+                        axis.drawCrosshair(e);
+                    }
                 });
             },
 
@@ -13091,7 +13191,7 @@
                 var series = this.chart.hoverSeries,
                     relatedTarget = e.relatedTarget || e.toElement;
 
-                if (series && relatedTarget && !series.options.stickyTracking &&
+                if (series && relatedTarget && !series.stickyTracking &&
                     !this.inClass(relatedTarget, 'highcharts-tooltip') &&
                     (!this.inClass(relatedTarget, 'highcharts-series-' + series.index) || // #2499, #4465
                         !this.inClass(relatedTarget, 'highcharts-tracker') // #5553
@@ -13181,7 +13281,15 @@
             destroy: function() {
                 var prop;
 
-                removeEvent(this.chart.container, 'mouseleave', this.onContainerMouseLeave);
+                if (this.unDocMouseMove) {
+                    this.unDocMouseMove();
+                }
+
+                removeEvent(
+                    this.chart.container,
+                    'mouseleave',
+                    this.onContainerMouseLeave
+                );
                 if (!H.chartCount) {
                     removeEvent(doc, 'mouseup', this.onDocumentMouseUp);
                     removeEvent(doc, 'touchend', this.onDocumentTouchEnd);
@@ -13199,7 +13307,7 @@
     }(Highcharts));
     (function(H) {
         /**
-         * (c) 2010-2016 Torstein Honsi
+         * (c) 2010-2017 Torstein Honsi
          *
          * License: www.highcharts.com/license
          */
@@ -13476,7 +13584,7 @@
     }(Highcharts));
     (function(H) {
         /**
-         * (c) 2010-2016 Torstein Honsi
+         * (c) 2010-2017 Torstein Honsi
          *
          * License: www.highcharts.com/license
          */
@@ -13595,7 +13703,7 @@
     }(Highcharts));
     (function(H) {
         /**
-         * (c) 2010-2016 Torstein Honsi
+         * (c) 2010-2017 Torstein Honsi
          *
          * License: www.highcharts.com/license
          */
@@ -13657,8 +13765,7 @@
 
                 this.itemMarginTop = options.itemMarginTop || 0;
                 this.padding = padding;
-                this.initialItemX = padding;
-                this.initialItemY = padding - 5; // 5 is the number of pixels above the text
+                this.initialItemY = padding - 5; // 5 is pixels above the text
                 this.maxItemWidth = 0;
                 this.itemHeight = 0;
                 this.symbolWidth = pick(options.symbolWidth, 16);
@@ -13667,8 +13774,8 @@
             },
 
             /**
-             * Update the legend with new options. Equivalent to running chart.update with a legend
-             * configuration option.
+             * Update the legend with new options. Equivalent to running chart.update
+             * with a legend configuration option.
              * @param {Object} options Legend options
              * @param {Boolean} redraw Whether to redraw the chart, defaults to true.
              */
@@ -13689,7 +13796,9 @@
              * @param {Object} visible Dimmed or colored
              */
             colorizeItem: function(item, visible) {
-                item.legendGroup[visible ? 'removeClass' : 'addClass']('highcharts-legend-item-hidden');
+                item.legendGroup[visible ? 'removeClass' : 'addClass'](
+                    'highcharts-legend-item-hidden'
+                );
 
 
                 var legend = this,
@@ -13709,8 +13818,8 @@
                 if (legendItem) {
                     legendItem.css({
                         fill: textColor,
-                        color: textColor
-                    }); // color for #1553, oldIE
+                        color: textColor // #1553, oldIE
+                    });
                 }
                 if (legendLine) {
                     legendLine.attr({
@@ -13753,7 +13862,9 @@
 
                 if (legendGroup && legendGroup.element) {
                     legendGroup.translate(
-                        ltr ? itemX : legend.legendWidth - itemX - 2 * symbolPadding - 4,
+                        ltr ?
+                        itemX :
+                        legend.legendWidth - itemX - 2 * symbolPadding - 4,
                         itemY
                     );
                 }
@@ -13772,11 +13883,14 @@
                 var checkbox = item.checkbox;
 
                 // destroy SVG elements
-                each(['legendItem', 'legendLine', 'legendSymbol', 'legendGroup'], function(key) {
-                    if (item[key]) {
-                        item[key] = item[key].destroy();
+                each(
+                    ['legendItem', 'legendLine', 'legendSymbol', 'legendGroup'],
+                    function(key) {
+                        if (item[key]) {
+                            item[key] = item[key].destroy();
+                        }
                     }
-                });
+                );
 
                 if (checkbox) {
                     discardElement(item.checkbox);
@@ -13828,11 +13942,14 @@
                             top;
 
                         if (checkbox) {
-                            top = translateY + titleHeight + checkbox.y + (scrollOffset || 0) + 3;
+                            top = translateY + titleHeight + checkbox.y +
+                                (scrollOffset || 0) + 3;
                             css(checkbox, {
-                                left: (alignAttr.translateX + item.checkboxOffset + checkbox.x - 20) + 'px',
+                                left: (alignAttr.translateX + item.checkboxOffset +
+                                    checkbox.x - 20) + 'px',
                                 top: top + 'px',
-                                display: top > translateY - 6 && top < translateY + clipHeight - 6 ? '' : 'none'
+                                display: top > translateY - 6 && top < translateY +
+                                    clipHeight - 6 ? '' : 'none'
                             });
                         }
                     });
@@ -13851,7 +13968,17 @@
 
                 if (titleOptions.text) {
                     if (!this.title) {
-                        this.title = this.chart.renderer.label(titleOptions.text, padding - 3, padding - 4, null, null, null, null, null, 'legend-title')
+                        this.title = this.chart.renderer.label(
+                                titleOptions.text,
+                                padding - 3,
+                                padding - 4,
+                                null,
+                                null,
+                                null,
+                                null,
+                                null,
+                                'legend-title'
+                            )
                             .attr({
                                 zIndex: 1
                             })
@@ -13876,7 +14003,8 @@
             setText: function(item) {
                 var options = this.options;
                 item.legendItem.attr({
-                    text: options.labelFormat ? H.format(options.labelFormat, item) : options.labelFormatter.call(item)
+                    text: options.labelFormat ?
+                        H.format(options.labelFormat, item) : options.labelFormatter.call(item)
                 });
             },
 
@@ -13903,24 +14031,30 @@
                     widthOption = options.width,
                     itemMarginBottom = options.itemMarginBottom || 0,
                     itemMarginTop = legend.itemMarginTop,
-                    initialItemX = legend.initialItemX,
                     bBox,
                     itemWidth,
                     li = item.legendItem,
                     isSeries = !item.series,
-                    series = !isSeries && item.series.drawLegendSymbol ? item.series : item,
+                    series = !isSeries && item.series.drawLegendSymbol ?
+                    item.series :
+                    item,
                     seriesOptions = series.options,
-                    showCheckbox = legend.createCheckboxForItem && seriesOptions && seriesOptions.showCheckbox,
+                    showCheckbox = legend.createCheckboxForItem &&
+                    seriesOptions &&
+                    seriesOptions.showCheckbox,
                     useHTML = options.useHTML,
-                    fontSize = 12;
+                    fontSize = 12,
+                    itemClassName = item.options.className;
 
                 if (!li) { // generate it once, later move it
 
-                    // Generate the group box
-                    // A group to hold the symbol and text. Text is to be appended in Legend class.
+                    // Generate the group box, a group to hold the symbol and text. Text
+                    // is to be appended in Legend class.
                     item.legendGroup = renderer.g('legend-item')
-                        .addClass('highcharts-' + series.type + '-series highcharts-color-' + item.colorIndex +
-                            (item.options.className ? ' ' + item.options.className : '') +
+                        .addClass(
+                            'highcharts-' + series.type + '-series ' +
+                            'highcharts-color-' + item.colorIndex +
+                            (itemClassName ? ' ' + itemClassName : '') +
                             (isSeries ? ' highcharts-series-' + item.index : '')
                         )
                         .attr({
@@ -13936,7 +14070,8 @@
                             useHTML
                         )
 
-                        .css(merge(item.visible ? itemStyle : itemHiddenStyle)) // merge to prevent modifying original (#1021)
+                        // merge to prevent modifying original (#1021)
+                        .css(merge(item.visible ? itemStyle : itemHiddenStyle))
 
                         .attr({
                             align: ltr ? 'left' : 'right',
@@ -13944,7 +14079,8 @@
                         })
                         .add(item.legendGroup);
 
-                    // Get the baseline for the first item - the font size is equal for all
+                    // Get the baseline for the first item - the font size is equal for
+                    // all
                     if (!legend.baseline) {
 
                         fontSize = itemStyle.fontSize;
@@ -13983,19 +14119,30 @@
                 itemWidth = item.checkboxOffset =
                     options.itemWidth ||
                     item.legendItemWidth ||
-                    symbolWidth + symbolPadding + bBox.width + itemDistance + (showCheckbox ? 20 : 0);
-                legend.itemHeight = itemHeight = Math.round(item.legendItemHeight || bBox.height);
-
-                // if the item exceeds the width, start a new line
-                if (horizontal && legend.itemX - initialItemX + itemWidth >
-                    (widthOption || (chart.chartWidth - 2 * padding - initialItemX - options.x))) {
-                    legend.itemX = initialItemX;
-                    legend.itemY += itemMarginTop + legend.lastLineHeight + itemMarginBottom;
+                    symbolWidth + symbolPadding + bBox.width + itemDistance +
+                    (showCheckbox ? 20 : 0);
+                legend.itemHeight = itemHeight = Math.round(
+                    item.legendItemHeight || bBox.height || legend.symbolHeight
+                );
+
+                // If the item exceeds the width, start a new line
+                if (
+                    horizontal &&
+                    legend.itemX - padding + itemWidth > (
+                        widthOption || (
+                            chart.spacingBox.width - 2 * padding - options.x
+                        )
+                    )
+                ) {
+                    legend.itemX = padding;
+                    legend.itemY += itemMarginTop + legend.lastLineHeight +
+                        itemMarginBottom;
                     legend.lastLineHeight = 0; // reset for next line (#915, #3976)
                 }
 
                 // If the item exceeds the height, start a new column
-                /*if (!horizontal && legend.itemY + options.y + itemHeight > chart.chartHeight - spacingTop - spacingBottom) {
+                /*if (!horizontal && legend.itemY + options.y +
+                		itemHeight > chart.chartHeight - spacingTop - spacingBottom) {
                 	legend.itemY = legend.initialItemY;
                 	legend.itemX += legend.maxItemWidth;
                 	legend.maxItemWidth = 0;
@@ -14004,7 +14151,10 @@
                 // Set the edge positions
                 legend.maxItemWidth = Math.max(legend.maxItemWidth, itemWidth);
                 legend.lastItemY = itemMarginTop + legend.itemY + itemMarginBottom;
-                legend.lastLineHeight = Math.max(itemHeight, legend.lastLineHeight); // #915
+                legend.lastLineHeight = Math.max( // #915
+                    itemHeight,
+                    legend.lastLineHeight
+                );
 
                 // cache the position of the newly generated or reordered items
                 item._legendItemPos = [legend.itemX, legend.itemY];
@@ -14020,29 +14170,36 @@
 
                 // the width of the widest item
                 legend.offsetWidth = widthOption || Math.max(
-                    (horizontal ? legend.itemX - initialItemX - itemDistance : itemWidth) + padding,
+                    (horizontal ? legend.itemX - padding - itemDistance : itemWidth) +
+                    padding,
                     legend.offsetWidth
                 );
             },
 
             /**
-             * Get all items, which is one item per series for normal series and one item per point
-             * for pie series.
+             * Get all items, which is one item per series for normal series and one
+             * item per point for pie series.
              */
             getAllItems: function() {
                 var allItems = [];
                 each(this.chart.series, function(series) {
                     var seriesOptions = series && series.options;
 
-                    // Handle showInLegend. If the series is linked to another series, defaults to false.
-                    if (series && pick(seriesOptions.showInLegend, !defined(seriesOptions.linkedTo) ? undefined : false, true)) {
+                    // Handle showInLegend. If the series is linked to another series,
+                    // defaults to false.
+                    if (series && pick(
+                            seriesOptions.showInLegend, !defined(seriesOptions.linkedTo) ? undefined : false, true
+                        )) {
 
-                        // Use points or series for the legend item depending on legendType
+                        // Use points or series for the legend item depending on
+                        // legendType
                         allItems = allItems.concat(
                             series.legendItems ||
-                            (seriesOptions.legendType === 'point' ?
+                            (
+                                seriesOptions.legendType === 'point' ?
                                 series.data :
-                                series)
+                                series
+                            )
                         );
                     }
                 });
@@ -14050,15 +14207,18 @@
             },
 
             /**
-             * Adjust the chart margins by reserving space for the legend on only one side
-             * of the chart. If the position is set to a corner, top or bottom is reserved
-             * for horizontal legends and left or right for vertical ones.
+             * Adjust the chart margins by reserving space for the legend on only one
+             * side of the chart. If the position is set to a corner, top or bottom is
+             * reserved for horizontal legends and left or right for vertical ones.
              */
             adjustMargins: function(margin, spacing) {
                 var chart = this.chart,
                     options = this.options,
-                    // Use the first letter of each alignment option in order to detect the side
-                    alignment = options.align.charAt(0) + options.verticalAlign.charAt(0) + options.layout.charAt(0); // #4189 - use charAt(x) notation instead of [x] for IE7
+                    // Use the first letter of each alignment option in order to detect
+                    // the side. (#4189 - use charAt(x) notation instead of [x] for IE7)
+                    alignment = options.align.charAt(0) +
+                    options.verticalAlign.charAt(0) +
+                    options.layout.charAt(0);
 
                 if (!options.floating) {
 
@@ -14069,12 +14229,19 @@
                         /(lbv|lm|ltv)/
                     ], function(alignments, side) {
                         if (alignments.test(alignment) && !defined(margin[side])) {
-                            // Now we have detected on which side of the chart we should reserve space for the legend
+                            // Now we have detected on which side of the chart we should
+                            // reserve space for the legend
                             chart[marginNames[side]] = Math.max(
                                 chart[marginNames[side]],
-                                chart.legend[(side + 1) % 2 ? 'legendHeight' : 'legendWidth'] + [1, -1, -1, 1][side] * options[(side % 2) ? 'x' : 'y'] +
-                                pick(options.margin, 12) +
-                                spacing[side]
+                                (
+                                    chart.legend[
+                                        (side + 1) % 2 ? 'legendHeight' : 'legendWidth'
+                                    ] + [1, -1, -1, 1][side] * options[
+                                        (side % 2) ? 'x' : 'y'
+                                    ] +
+                                    pick(options.margin, 12) +
+                                    spacing[side]
+                                )
                             );
                         }
                     });
@@ -14099,7 +14266,7 @@
                     options = legend.options,
                     padding = legend.padding;
 
-                legend.itemX = legend.initialItemX;
+                legend.itemX = padding;
                 legend.itemY = legend.initialItemY;
                 legend.offsetWidth = 0;
                 legend.lastItemY = 0;
@@ -14126,7 +14293,8 @@
 
                 // sort by legendIndex
                 stableSort(allItems, function(a, b) {
-                    return ((a.options && a.options.legendIndex) || 0) - ((b.options && b.options.legendIndex) || 0);
+                    return ((a.options && a.options.legendIndex) || 0) -
+                        ((b.options && b.options.legendIndex) || 0);
                 });
 
                 // reversed legend
@@ -14145,7 +14313,8 @@
 
                 // Get the box
                 legendWidth = (options.width || legend.offsetWidth) + padding;
-                legendHeight = legend.lastItemY + legend.lastLineHeight + legend.titleHeight;
+                legendHeight = legend.lastItemY + legend.lastLineHeight +
+                    legend.titleHeight;
                 legendHeight = legend.handleOverflow(legendHeight);
                 legendHeight += padding;
 
@@ -14191,8 +14360,8 @@
                 legend.legendWidth = legendWidth;
                 legend.legendHeight = legendHeight;
 
-                // Now that the legend width and height are established, put the items in the
-                // final position
+                // Now that the legend width and height are established, put the items
+                // in the final position
                 each(allItems, function(item) {
                     legend.positionItem(item);
                 });
@@ -14205,7 +14374,8 @@
                 	prop = props[i];
                 	if (options.style[prop] && options.style[prop] !== 'auto') {
                 		options[i < 2 ? 'align' : 'verticalAlign'] = prop;
-                		options[i < 2 ? 'x' : 'y'] = pInt(options.style[prop]) * (i % 2 ? -1 : 1);
+                		options[i < 2 ? 'x' : 'y'] = 
+                			pInt(options.style[prop]) * (i % 2 ? -1 : 1);
                 	}
                 }*/
 
@@ -14222,8 +14392,8 @@
             },
 
             /**
-             * Set up the overflow handling by adding navigation with up and down arrows below the
-             * legend.
+             * Set up the overflow handling by adding navigation with up and down arrows
+             * below the legend.
              */
             handleOverflow: function(legendHeight) {
                 var legend = this,
@@ -14232,7 +14402,9 @@
                     options = this.options,
                     optionsY = options.y,
                     alignTop = options.verticalAlign === 'top',
-                    spaceHeight = chart.spacingBox.height + (alignTop ? -optionsY : optionsY) - this.padding,
+                    padding = this.padding,
+                    spaceHeight = chart.spacingBox.height +
+                    (alignTop ? -optionsY : optionsY) - padding,
                     maxHeight = options.maxHeight,
                     clipHeight,
                     clipRect = this.clipRect,
@@ -14241,7 +14413,6 @@
                     arrowSize = navOptions.arrowSize || 12,
                     nav = this.nav,
                     pages = this.pages,
-                    padding = this.padding,
                     lastY,
                     allItems = this.allItems,
                     clipToHeight = function(height) {
@@ -14265,7 +14436,11 @@
 
 
                 // Adjust the height
-                if (options.layout === 'horizontal' && options.verticalAlign !== 'middle' && !options.floating) {
+                if (
+                    options.layout === 'horizontal' &&
+                    options.verticalAlign !== 'middle' &&
+                    !options.floating
+                ) {
                     spaceHeight /= 2;
                 }
                 if (maxHeight) {
@@ -14276,23 +14451,26 @@
                 pages.length = 0;
                 if (legendHeight > spaceHeight && navOptions.enabled !== false) {
 
-                    this.clipHeight = clipHeight = Math.max(spaceHeight - 20 - this.titleHeight - padding, 0);
+                    this.clipHeight = clipHeight =
+                        Math.max(spaceHeight - 20 - this.titleHeight - padding, 0);
                     this.currentPage = pick(this.currentPage, 1);
                     this.fullHeight = legendHeight;
 
-                    // Fill pages with Y positions so that the top of each a legend item defines
-                    // the scroll top for each page (#2098)
+                    // Fill pages with Y positions so that the top of each a legend item
+                    // defines the scroll top for each page (#2098)
                     each(allItems, function(item, i) {
                         var y = item._legendItemPos[1],
                             h = Math.round(item.legendItem.getBBox().height),
                             len = pages.length;
 
-                        if (!len || (y - pages[len - 1] > clipHeight && (lastY || y) !== pages[len - 1])) {
+                        if (!len || (y - pages[len - 1] > clipHeight &&
+                                (lastY || y) !== pages[len - 1])) {
                             pages.push(lastY || y);
                             len++;
                         }
 
-                        if (i === allItems.length - 1 && y + h - pages[len - 1] > clipHeight) {
+                        if (i === allItems.length - 1 &&
+                            y + h - pages[len - 1] > clipHeight) {
                             pages.push(y);
                         }
                         if (y !== lastY) {
@@ -14300,9 +14478,11 @@
                         }
                     });
 
-                    // Only apply clipping if needed. Clipping causes blurred legend in PDF export (#1787)
+                    // Only apply clipping if needed. Clipping causes blurred legend in
+                    // PDF export (#1787)
                     if (!clipRect) {
-                        clipRect = legend.clipRect = renderer.clipRect(0, padding, 9999, 0);
+                        clipRect = legend.clipRect =
+                            renderer.clipRect(0, padding, 9999, 0);
                         legend.contentGroup.clip(clipRect);
                     }
 
@@ -14310,21 +14490,40 @@
 
                     // Add navigation elements
                     if (!nav) {
-                        this.nav = nav = renderer.g().attr({
-                            zIndex: 1
-                        }).add(this.group);
-                        this.up = renderer.symbol('triangle', 0, 0, arrowSize, arrowSize)
+                        this.nav = nav = renderer.g()
+                            .attr({
+                                zIndex: 1
+                            })
+                            .add(this.group);
+
+                        this.up = renderer
+                            .symbol(
+                                'triangle',
+                                0,
+                                0,
+                                arrowSize,
+                                arrowSize
+                            )
                             .on('click', function() {
                                 legend.scroll(-1, animation);
                             })
                             .add(nav);
+
                         this.pager = renderer.text('', 15, 10)
                             .addClass('highcharts-legend-navigation')
 
                             .css(navOptions.style)
 
                             .add(nav);
-                        this.down = renderer.symbol('triangle-down', 0, 0, arrowSize, arrowSize)
+
+                        this.down = renderer
+                            .symbol(
+                                'triangle-down',
+                                0,
+                                0,
+                                arrowSize,
+                                arrowSize
+                            )
                             .on('click', function() {
                                 legend.scroll(1, animation);
                             })
@@ -14381,27 +14580,31 @@
                         visibility: 'visible'
                     });
                     this.up.attr({
-                        'class': currentPage === 1 ? 'highcharts-legend-nav-inactive' : 'highcharts-legend-nav-active'
+                        'class': currentPage === 1 ?
+                            'highcharts-legend-nav-inactive' : 'highcharts-legend-nav-active'
                     });
                     pager.attr({
                         text: currentPage + '/' + pageCount
                     });
                     this.down.attr({
                         'x': 18 + this.pager.getBBox().width, // adjust to text width
-                        'class': currentPage === pageCount ? 'highcharts-legend-nav-inactive' : 'highcharts-legend-nav-active'
+                        'class': currentPage === pageCount ?
+                            'highcharts-legend-nav-inactive' : 'highcharts-legend-nav-active'
                     });
 
 
                     this.up
                         .attr({
-                            fill: currentPage === 1 ? navOptions.inactiveColor : navOptions.activeColor
+                            fill: currentPage === 1 ?
+                                navOptions.inactiveColor : navOptions.activeColor
                         })
                         .css({
                             cursor: currentPage === 1 ? 'default' : 'pointer'
                         });
                     this.down
                         .attr({
-                            fill: currentPage === pageCount ? navOptions.inactiveColor : navOptions.activeColor
+                            fill: currentPage === pageCount ?
+                                navOptions.inactiveColor : navOptions.activeColor
                         })
                         .css({
                             cursor: currentPage === pageCount ? 'default' : 'pointer'
@@ -14455,8 +14658,9 @@
             },
 
             /**
-             * Get the series' symbol in the legend. This method should be overridable to create custom
-             * symbols through Highcharts.seriesTypes[type].prototype.drawLegendSymbols.
+             * Get the series' symbol in the legend. This method should be overridable
+             * to create custom symbols through
+             * Highcharts.seriesTypes[type].prototype.drawLegendSymbols.
              *
              * @param {Object} legend The legend object
              */
@@ -14471,7 +14675,8 @@
                     generalRadius = symbolHeight / 2,
                     renderer = this.chart.renderer,
                     legendItemGroup = this.legendGroup,
-                    verticalCenter = legend.baseline - Math.round(legend.fontMetrics.b * 0.3),
+                    verticalCenter = legend.baseline -
+                    Math.round(legend.fontMetrics.b * 0.3),
                     attr = {};
 
                 // Draw the line
@@ -14532,11 +14737,13 @@
         // Workaround for #2030, horizontal legend items not displaying in IE11 Preview,
         // and for #2580, a similar drawing flaw in Firefox 26.
         // Explore if there's a general cause for this. The problem may be related
-        // to nested group elements, as the legend item texts are within 4 group elements.
+        // to nested group elements, as the legend item texts are within 4 group
+        // elements.
         if (/Trident\/7\.0/.test(win.navigator.userAgent) || isFirefox) {
             wrap(Legend.prototype, 'positionItem', function(proceed, item) {
                 var legend = this,
-                    runPositionItem = function() { // If chart destroyed in sync, this is undefined (#2030)
+                    // If chart destroyed in sync, this is undefined (#2030)
+                    runPositionItem = function() {
                         if (item._legendItemPos) {
                             proceed.call(legend, item);
                         }
@@ -14553,7 +14760,7 @@
     }(Highcharts));
     (function(H) {
         /**
-         * (c) 2010-2016 Torstein Honsi
+         * (c) 2010-2017 Torstein Honsi
          *
          * License: www.highcharts.com/license
          */
@@ -15104,7 +15311,8 @@
             },
 
             /**
-             * Lay out the chart titles and cache the full offset height for use in getMargins
+             * Lay out the chart titles and cache the full offset height for use
+             * in getMargins
              */
             layOutTitles: function(redraw) {
                 var titleOffset = 0,
@@ -15126,14 +15334,19 @@
 
                         title
                             .css({
-                                width: (titleOptions.width || spacingBox.width + titleOptions.widthAdjust) + 'px'
+                                width: (titleOptions.width ||
+                                    spacingBox.width + titleOptions.widthAdjust) + 'px'
                             })
                             .align(extend({
                                 y: titleOffset + titleSize + (key === 'title' ? -3 : 2)
                             }, titleOptions), false, 'spacingBox');
 
                         if (!titleOptions.floating && !titleOptions.verticalAlign) {
-                            titleOffset = Math.ceil(titleOffset + title.getBBox().height);
+                            titleOffset = Math.ceil(
+                                titleOffset +
+                                // Skip the cache for HTML (#3481)
+                                title.getBBox(titleOptions.useHTML).height
+                            );
                         }
                     }
                 }, this);
@@ -16156,7 +16369,7 @@
     }(Highcharts));
     (function(H) {
         /**
-         * (c) 2010-2016 Torstein Honsi
+         * (c) 2010-2017 Torstein Honsi
          *
          * License: www.highcharts.com/license
          */
@@ -16506,7 +16719,7 @@
     }(Highcharts));
     (function(H) {
         /**
-         * (c) 2010-2016 Torstein Honsi
+         * (c) 2010-2017 Torstein Honsi
          *
          * License: www.highcharts.com/license
          */
@@ -16669,9 +16882,9 @@
             //valuePrefix: '',
             //ySuffix: ''
             //}
-            turboThreshold: 1000
+            turboThreshold: 1000,
             // zIndex: null
-
+            findNearestPointBy: 'x'
 
         }, /** @lends Series.prototype */ {
             isCartesian: true,
@@ -16915,6 +17128,19 @@
                     itemOptions.tooltip
                 );
 
+                // When shared tooltip, stickyTracking is true by default,
+                // unless user says otherwise.
+                this.stickyTracking = pick(
+                    itemOptions.stickyTracking,
+                    userPlotOptions[this.type] && userPlotOptions[this.type].stickyTracking,
+                    userPlotOptions.series && userPlotOptions.series.stickyTracking,
+                    (
+                        this.tooltipOptions.shared && !this.noSharedTooltip ?
+                        true :
+                        options.stickyTracking
+                    )
+                );
+
                 // Delete marker object if not allowed (#1125)
                 if (typeOptions.marker === null) {
                     delete options.marker;
@@ -17300,8 +17526,10 @@
                         point = (new PointClass()).init(series, [processedXData[i]].concat(splat(processedYData[i])));
                         point.dataGroup = series.groupMap[i];
                     }
-                    point.index = cursor; // For faster access in Point.update
-                    points[i] = point;
+                    if (point) { // #6279
+                        point.index = cursor; // For faster access in Point.update
+                        points[i] = point;
+                    }
                 }
 
                 // Hide cropped-away points - this only runs when the number of points is above cropThreshold, or when
@@ -17354,7 +17582,7 @@
                     // visible range, consider y extremes
                     validValue = (isNumber(y, true) || isArray(y)) && (!yAxis.positiveValuesOnly || (y.length || y > 0));
                     withinRange = this.getExtremesFromAll || this.options.getExtremesFromAll || this.cropped ||
-                        ((xData[i + 1] || x) >= xMin && (xData[i - 1] || x) <= xMax);
+                        ((xData[i] || x) >= xMin && (xData[i] || x) <= xMax);
 
                     if (validValue && withinRange) {
 
@@ -17370,6 +17598,7 @@
                         }
                     }
                 }
+
                 this.dataMin = arrayMin(activeYData);
                 this.dataMax = arrayMax(activeYData);
             },
@@ -17582,7 +17811,6 @@
                             chart[sharedClipKey] = chart[sharedClipKey].destroy();
                         }
                         if (chart[sharedClipKey + 'm']) {
-                            this.markerGroup.clip();
                             chart[sharedClipKey + 'm'] = chart[sharedClipKey + 'm'].destroy();
                         }
                     }
@@ -18426,7 +18654,6 @@
              * KD Tree && PointSearching Implementation
              */
 
-            kdDimensions: 1,
             kdAxisArray: ['clientX', 'plotY'],
 
             searchPoint: function(e, compareX) {
@@ -18453,7 +18680,8 @@
                 this.buildingKdTree = true;
 
                 var series = this,
-                    dimensions = series.kdDimensions;
+                    dimensions = series.options.findNearestPointBy.indexOf('y') > -1 ?
+                    2 : 1;
 
                 // Internal function
                 function _kdtree(points, depth, dimensions) {
@@ -18504,7 +18732,9 @@
                 var series = this,
                     kdX = this.kdAxisArray[0],
                     kdY = this.kdAxisArray[1],
-                    kdComparer = compareX ? 'distX' : 'dist';
+                    kdComparer = compareX ? 'distX' : 'dist',
+                    kdDimensions = series.options.findNearestPointBy.indexOf('y') > -1 ?
+                    2 : 1;
 
                 // Set the one and two dimensional distance on the point object
                 function setDistance(p1, p2) {
@@ -18555,8 +18785,7 @@
                 }
 
                 if (this.kdTree) {
-                    return _search(point,
-                        this.kdTree, this.kdDimensions, this.kdDimensions);
+                    return _search(point, this.kdTree, kdDimensions, kdDimensions);
                 }
             }
 
@@ -18565,7 +18794,7 @@
     }(Highcharts));
     (function(H) {
         /**
-         * (c) 2010-2016 Torstein Honsi
+         * (c) 2010-2017 Torstein Honsi
          *
          * License: www.highcharts.com/license
          */
@@ -19050,7 +19279,7 @@
     }(Highcharts));
     (function(H) {
         /**
-         * (c) 2010-2016 Torstein Honsi
+         * (c) 2010-2017 Torstein Honsi
          *
          * License: www.highcharts.com/license
          */
@@ -19270,7 +19499,13 @@
                     }
 
                     if ('inverted' in optionsChart || 'polar' in optionsChart) {
-                        this.propFromSeries(); // Parses options.chart.inverted and options.chart.polar together with the available series
+                        // Parse options.chart.inverted and options.chart.polar together
+                        // with the available series.
+                        this.propFromSeries();
+                        updateAllAxes = true;
+                    }
+
+                    if ('alignTicks' in optionsChart) { // #6452
                         updateAllAxes = true;
                     }
 
@@ -19334,7 +19569,7 @@
                 // update the first series in the chart. Setting two series without
                 // an id will update the first and the second respectively (#6019)
                 // chart.update and responsive.
-                each(['xAxis', 'yAxis', 'series'], function(coll) {
+                each(['xAxis', 'yAxis', 'series', 'colorAxis', 'pane'], function(coll) {
                     if (options[coll]) {
                         each(splat(options[coll]), function(newOptions, i) {
                             var item = (
@@ -19774,7 +20009,7 @@
     }(Highcharts));
     (function(H) {
         /**
-         * (c) 2010-2016 Torstein Honsi
+         * (c) 2010-2017 Torstein Honsi
          *
          * License: www.highcharts.com/license
          */
@@ -20105,7 +20340,7 @@
     }(Highcharts));
     (function(H) {
         /**
-         * (c) 2010-2016 Torstein Honsi
+         * (c) 2010-2017 Torstein Honsi
          *
          * License: www.highcharts.com/license
          */
@@ -20243,7 +20478,7 @@
     }(Highcharts));
     (function(H) {
         /**
-         * (c) 2010-2016 Torstein Honsi
+         * (c) 2010-2017 Torstein Honsi
          *
          * License: www.highcharts.com/license
          */
@@ -20265,7 +20500,7 @@
     }(Highcharts));
     (function(H) {
         /**
-         * (c) 2010-2016 Torstein Honsi
+         * (c) 2010-2017 Torstein Honsi
          *
          * License: www.highcharts.com/license
          */
@@ -20290,6 +20525,7 @@
         seriesType('column', 'line', {
             borderRadius: 0,
             //colorByPoint: undefined,
+            crisp: true,
             groupPadding: 0.2,
             //grouping: true,
             marker: null, // point options are specified in the base options
@@ -20448,9 +20684,11 @@
 
                 // Horizontal. We need to first compute the exact right edge, then round it
                 // and compute the width from there.
-                right = Math.round(x + w) + xCrisp;
-                x = Math.round(x) + xCrisp;
-                w = right - x;
+                if (this.options.crisp) {
+                    right = Math.round(x + w) + xCrisp;
+                    x = Math.round(x) + xCrisp;
+                    w = right - x;
+                }
 
                 // Vertical
                 bottom = Math.round(y + h) + yCrisp;
@@ -20731,7 +20969,7 @@
     }(Highcharts));
     (function(H) {
         /**
-         * (c) 2010-2016 Torstein Honsi
+         * (c) 2010-2017 Torstein Honsi
          *
          * License: www.highcharts.com/license
          */
@@ -20748,7 +20986,7 @@
     }(Highcharts));
     (function(H) {
         /**
-         * (c) 2010-2016 Torstein Honsi
+         * (c) 2010-2017 Torstein Honsi
          *
          * License: www.highcharts.com/license
          */
@@ -20759,6 +20997,7 @@
          */
         seriesType('scatter', 'line', {
             lineWidth: 0,
+            findNearestPointBy: 'xy',
             marker: {
                 enabled: true // Overrides auto-enabling in line series (#3647)
             },
@@ -20777,7 +21016,6 @@
             noSharedTooltip: true,
             trackerGroups: ['group', 'markerGroup', 'dataLabelsGroup'],
             takeOrdinalPosition: false, // #2342
-            kdDimensions: 2,
             drawGraph: function() {
                 if (this.options.lineWidth) {
                     Series.prototype.drawGraph.call(this);
@@ -20788,7 +21026,7 @@
     }(Highcharts));
     (function(H) {
         /**
-         * (c) 2010-2016 Torstein Honsi
+         * (c) 2010-2017 Torstein Honsi
          *
          * License: www.highcharts.com/license
          */
@@ -20837,7 +21075,7 @@
     }(Highcharts));
     (function(H) {
         /**
-         * (c) 2010-2016 Torstein Honsi
+         * (c) 2010-2017 Torstein Honsi
          *
          * License: www.highcharts.com/license
          */
@@ -21338,7 +21576,7 @@
     }(Highcharts));
     (function(H) {
         /**
-         * (c) 2010-2016 Torstein Honsi
+         * (c) 2010-2017 Torstein Honsi
          *
          * License: www.highcharts.com/license
          */
@@ -21537,9 +21775,9 @@
                         style.color = pick(options.color, style.color, series.color, '#000000');
                         // Get automated contrast color
                         if (style.color === 'contrast') {
+                            point.contrastColor = renderer.getContrast(point.color || series.color);
                             style.color = options.inside || options.distance < 0 || !!seriesOptions.stacking ?
-                                renderer.getContrast(point.color || series.color) :
-                                '#000000';
+                                point.contrastColor : '#000000';
                         }
                         if (seriesOptions.cursor) {
                             style.cursor = seriesOptions.cursor;
@@ -21705,7 +21943,14 @@
 
                 // Handle justify or crop
                 if (justify) {
-                    this.justifyDataLabel(dataLabel, options, alignAttr, bBox, alignTo, isNew);
+                    point.isLabelJustified = this.justifyDataLabel(
+                        dataLabel,
+                        options,
+                        alignAttr,
+                        bBox,
+                        alignTo,
+                        isNew
+                    );
 
                     // Now check that the data label is within the plot area
                 } else if (pick(options.crop, true)) {
@@ -21791,6 +22036,8 @@
                 dataLabel.placed = !isNew;
                 dataLabel.align(options, null, alignTo);
             }
+
+            return justified;
         };
 
         /**
@@ -22211,38 +22458,56 @@
 
                 // Call the parent method
                 Series.prototype.alignDataLabel.call(this, point, dataLabel, options, alignTo, isNew);
+
+                // If label was justified and we have contrast, set it:
+                if (point.isLabelJustified && point.contrastColor) {
+                    point.dataLabel.css({
+                        color: point.contrastColor
+                    });
+                }
             };
         }
 
     }(Highcharts));
     (function(H) {
         /**
-         * (c) 2009-2016 Torstein Honsi
+         * (c) 2009-2017 Torstein Honsi
          *
          * License: www.highcharts.com/license
          */
         /**
-         * Highcharts module to hide overlapping data labels. This module is included in Highcharts.
+         * Highcharts module to hide overlapping data labels. This module is included in
+         * Highcharts.
          */
         var Chart = H.Chart,
             each = H.each,
             pick = H.pick,
             addEvent = H.addEvent;
 
-        // Collect potensial overlapping data labels. Stack labels probably don't need to be 
-        // considered because they are usually accompanied by data labels that lie inside the columns.
+        // Collect potensial overlapping data labels. Stack labels probably don't need
+        // to be considered because they are usually accompanied by data labels that lie
+        // inside the columns.
         Chart.prototype.callbacks.push(function(chart) {
             function collectAndHide() {
                 var labels = [];
 
                 each(chart.series || [], function(series) {
                     var dlOptions = series.options.dataLabels,
-                        collections = series.dataLabelCollections || ['dataLabel']; // Range series have two collections
-                    if ((dlOptions.enabled || series._hasPointLabels) && !dlOptions.allowOverlap && series.visible) { // #3866
+                        // Range series have two collections
+                        collections = series.dataLabelCollections || ['dataLabel'];
+
+                    if (
+                        (dlOptions.enabled || series._hasPointLabels) &&
+                        !dlOptions.allowOverlap &&
+                        series.visible
+                    ) { // #3866
                         each(collections, function(coll) {
                             each(series.points, function(point) {
                                 if (point[coll]) {
-                                    point[coll].labelrank = pick(point.labelrank, point.shapeArgs && point.shapeArgs.height); // #4118
+                                    point[coll].labelrank = pick(
+                                        point.labelrank,
+                                        point.shapeArgs && point.shapeArgs.height
+                                    ); // #4118
                                     labels.push(point[coll]);
                                 }
                             });
@@ -22261,8 +22526,8 @@
         });
 
         /**
-         * Hide overlapping labels. Labels are moved and faded in and out on zoom to provide a smooth 
-         * visual imression.
+         * Hide overlapping labels. Labels are moved and faded in and out on zoom to
+         * provide a smooth visual imression.
          */
         Chart.prototype.hideOverlappingLabels = function(labels) {
 
@@ -22296,9 +22561,8 @@
                 }
             }
 
-            // Prevent a situation in a gradually rising slope, that each label
-            // will hide the previous one because the previous one always has
-            // lower rank.
+            // Prevent a situation in a gradually rising slope, that each label will
+            // hide the previous one because the previous one always has lower rank.
             labels.sort(function(a, b) {
                 return (b.labelrank || 0) - (a.labelrank || 0);
             });
@@ -22309,12 +22573,19 @@
 
                 for (j = i + 1; j < len; ++j) {
                     label2 = labels[j];
-                    if (label1 && label2 && label1.placed && label2.placed && label1.newOpacity !== 0 && label2.newOpacity !== 0) {
+                    if (
+                        label1 && label2 &&
+                        label1 !== label2 && // #6465, polar chart with connectEnds
+                        label1.placed && label2.placed &&
+                        label1.newOpacity !== 0 && label2.newOpacity !== 0
+                    ) {
                         pos1 = label1.alignAttr;
                         pos2 = label2.alignAttr;
-                        parent1 = label1.parentGroup; // Different panes have different positions
+                        // Different panes have different positions
+                        parent1 = label1.parentGroup;
                         parent2 = label2.parentGroup;
-                        padding = 2 * (label1.box ? 0 : label1.padding); // Substract the padding if no background or border (#4333)
+                        // Substract the padding if no background or border (#4333)
+                        padding = 2 * (label1.box ? 0 : label1.padding);
                         isIntersecting = intersectRect(
                             pos1.x + parent1.translateX,
                             pos1.y + parent1.translateY,
@@ -22327,7 +22598,8 @@
                         );
 
                         if (isIntersecting) {
-                            (label1.labelrank < label2.labelrank ? label1 : label2).newOpacity = 0;
+                            (label1.labelrank < label2.labelrank ? label1 : label2)
+                            .newOpacity = 0;
                         }
                     }
                 }
@@ -22343,7 +22615,8 @@
 
                     if (label.oldOpacity !== newOpacity && label.placed) {
 
-                        // Make sure the label is completely hidden to avoid catching clicks (#4362)
+                        // Make sure the label is completely hidden to avoid catching
+                        // clicks (#4362)
                         if (newOpacity) {
                             label.show(true);
                         } else {
@@ -22354,7 +22627,11 @@
 
                         // Animate or set the opacity					
                         label.alignAttr.opacity = newOpacity;
-                        label[label.isOld ? 'animate' : 'attr'](label.alignAttr, null, complete);
+                        label[label.isOld ? 'animate' : 'attr'](
+                            label.alignAttr,
+                            null,
+                            complete
+                        );
 
                     }
                     label.isOld = true;
@@ -22365,7 +22642,7 @@
     }(Highcharts));
     (function(H) {
         /**
-         * (c) 2010-2016 Torstein Honsi
+         * (c) 2010-2017 Torstein Honsi
          *
          * License: www.highcharts.com/license
          */
@@ -23145,7 +23422,7 @@
 
 
                 // hide the tooltip
-                if (tooltip && !options.stickyTracking && (!tooltip.shared || series.noSharedTooltip)) {
+                if (tooltip && !series.stickyTracking && (!tooltip.shared || series.noSharedTooltip)) {
                     tooltip.hide();
                 }
 
@@ -23324,7 +23601,7 @@
     }(Highcharts));
     (function(H) {
         /**
-         * (c) 2010-2016 Torstein Honsi
+         * (c) 2010-2017 Torstein Honsi
          *
          * License: www.highcharts.com/license
          */