highcharts-rails 4.2.4 → 4.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 97714de447dedd03f4f7d06964a96824433b7915
-  data.tar.gz: e14b8a7a89bf5de5a48bb2c2118036292fc4e96d
+  metadata.gz: 2939d4feed91c6aa1664e68c33af311c52c7bccc
+  data.tar.gz: cee7f47daf110070a74c538933732d46f056e8ad
 SHA512:
-  metadata.gz: 38bb75286a35565c01ae20b6785d962a7ba5f4b9d2792807d490a89950838b2f1db2c1ba67bc3f3b9f3beeadaeea32cc0ddcbe1d4341ac6e674ce8c3b20cbe40
-  data.tar.gz: 8d4f48c2627791d0ca196f4084adea4c9ab94306d7efa1373996e113c62ea76b36946121755b08c0beb4d4669008d4ad425a02016f7e388efa0ccf187b435f15
+  metadata.gz: df01b55b3c3e82c15e846e5f7f35fd0cfad67cbdbc67570ae7ebd737ff58d2c4cd19829ce599a08fb142ba771337f914b9079b688eef55dc8ae8e1079675fb1e
+  data.tar.gz: 54e18726fabf8b724ce627bd2538d4a8c6948d0da8fac305405e32eec19bd32229461455a11cb11a3895c21d1aab8d1602f58199775e45c7ef33cdbc92f45258

data/CHANGELOG.markdown

@@ -1,6 +1,33 @@
+# 4.2.5 / 2016-05-06
+
+* Updated Highcharts to 4.2.5 (2016-05-06)
+  * Added new option, exporting.printMaxWidth, to prevent printed charts cut off on the right side. Closes #2088.
+  * Added new option, title.widthAdjust and subtitle.widthAdjust, to prevent titles from flowing over elements.
+  * Added support for JPEG in offline download module, ref #5157
+  * Fixed #3070, verticalAlign didn't work with rotated data labels on column series.
+  * Fixed #4087, error 11 was not described on the website.
+  * Fixed #4670, zones colors were not applied for markers on hover.
+  * Fixed #5211, titleSetter in combination with buildText added duplicate content to the title.
+  * Fixed #5220, a regression causing JS error when resizing polar charts.
+  * Fixed #5221, support for minPointLength in xrange study.
+  * Fixed #5226, polar chart with no data failed with error.
+  * Fixed #5228, scroller.getUnionExtremes did not consider navigation axis min and max.
+  * Fixed #5230, a horizontal and opposite axis used to have wrong alignment for its title.
+  * Fixed #5234, x value of null cancelled rendering of all points.
+  * Fixed #5236, last point was not always visible due to rounding errors.
+  * Fixed #5237, inverted should not have an effect on polar charts.
+  * Fixed #5250, columns were not visible in IE10.
+  * Fixed #5254, data labels were not aligned to the point box in heatmaps.
+  * Fixed #5259, crosshair prevented point hover when drawn above points.
+  * Fixed #5261, break at the end of a label caused wrong bounding box.
+  * Fixed #5266, pinchDown was sometimes empty on Android.
+  * Fixed #5269, crosshairs on wrong point with multiple series and non-shared tooltip.
+  * Fixed #5274, dataLabels.overflow not always respected on heatmaps.
+  * Fixed issue in the xrange study with axis extremes when there were other, more extended series in the same chart.
+
 # 4.2.4 / 2016-05-06
 
-* Updated Highcharts to 4.2.4
+* Updated Highcharts to 4.2.4 (2016-04-14)
   * Added support for polar columnrange series.
   * Added e.originalEvent to drilldown event in order to catch modifier keys and other properties. Closes #5113.
   * Added new drilldown event, chart.events.drillupall, that is triggered after multiple single drillup events. Closes #5158. Closes #5159.

data/app/assets/javascripts/highcharts.js

@@ -2,7 +2,7 @@
 // @compilation_level SIMPLE_OPTIMIZATIONS
 
 /**
- * @license Highcharts JS v4.2.4 (2016-04-14)
+ * @license Highcharts JS v4.2.5 (2016-05-06)
  *
  * (c) 2009-2016 Torstein Honsi
  *
@@ -59,7 +59,7 @@
         charts = [],
         chartCount = 0,
         PRODUCT = 'Highcharts',
-        VERSION = '4.2.4',
+        VERSION = '4.2.5',
 
         // some constants for frequently used strings
         DIV = 'div',
@@ -482,9 +482,9 @@
      * Check for number
      * @param {Object} n
      */
-    function isNumber(n) {
-        return typeof n === 'number';
-    }
+    var isNumber = Highcharts.isNumber = function isNumber(n) {
+        return typeof n === 'number' && !isNaN(n);
+    };
 
     /**
      * Remove last occurence of an item from an array
@@ -676,7 +676,7 @@
      * @param {Boolean} capitalize
      */
     dateFormat = function (format, timestamp, capitalize) {
-        if (!defined(timestamp) || isNaN(timestamp)) {
+        if (!isNumber(timestamp)) {
             return defaultOptions.lang.invalidDate || '';
         }
         format = pick(format, '%Y-%m-%d %H:%M:%S');
@@ -1019,6 +1019,7 @@
     Highcharts.numberFormat = function (number, decimals, decimalPoint, thousandsSep) {
 
         number = +number || 0;
+        decimals = +decimals;
 
         var lang = defaultOptions.lang,
             origDec = (number.toString().split('.')[1] || '').length,
@@ -1030,7 +1031,7 @@
 
         if (decimals === -1) {
             decimals = Math.min(origDec, 20); // Preserve decimals. Not huge numbers (#3793).
-        } else if (isNaN(decimals)) {
+        } else if (!isNumber(decimals)) {
             decimals = 2;
         }
 
@@ -1055,7 +1056,7 @@
         ret += strinteger.substr(thousands).replace(/(\d{3})(?=\d)/g, '$1' + thousandsSep);
 
         // Add the decimal point and the decimal component
-        if (+decimals) {
+        if (decimals) {
             // Get the decimal component, and add power to avoid rounding errors with float numbers (#4573)
             decimalComponent = Math.abs(absNumber - strinteger + Math.pow(10, -Math.max(decimals, origDec) - 1));
             ret += decimalPoint + decimalComponent.toFixed(decimals).slice(2);
@@ -1534,7 +1535,7 @@
             useUTC: true,
             //timezoneOffset: 0,
             canvasToolsURL: 'http://code.highcharts.com/modules/canvas-tools.js',
-            VMLRadialGradientURL: 'http://code.highcharts.com/4.2.4/gfx/vml-radial-gradient.png'
+            VMLRadialGradientURL: 'http://code.highcharts.com/4.2.5/gfx/vml-radial-gradient.png'
         },
         chart: {
             //animation: true,
@@ -1593,7 +1594,8 @@
             style: {
                 color: '#333333',
                 fontSize: '18px'
-            }
+            },
+            widthAdjust: -44
 
         },
         subtitle: {
@@ -1605,7 +1607,8 @@
             // y: null,
             style: {
                 color: '#555555'
-            }
+            },
+            widthAdjust: -44
         },
 
         plotOptions: {
@@ -2016,7 +2019,7 @@
                 });
 
             // it's NaN if gradient colors on a column chart
-            } else if (rgba && !isNaN(rgba[0])) {
+            } else if (rgba && isNumber(rgba[0])) {
                 if (format === 'rgb' || (!format && rgba[3] === 1)) {
                     ret = 'rgb(' + rgba[0] + ',' + rgba[1] + ',' + rgba[2] + ')';
                 } else if (format === 'a') {
@@ -3179,6 +3182,12 @@
                 titleNode = doc.createElementNS(SVG_NS, 'title');
                 this.element.appendChild(titleNode);
             }
+
+            // Remove text content if it exists
+            if (titleNode.firstChild) {
+                titleNode.removeChild(titleNode.firstChild);
+            }
+
             titleNode.appendChild(
                 doc.createTextNode(
                     (String(pick(value), '')).replace(/<[^>]*>/g, '') // #3276, #3895
@@ -3474,6 +3483,7 @@
                 childNodes = textNode.childNodes,
                 styleRegex,
                 hrefRegex,
+                wasTooLong,
                 parentX = attr(textNode, 'x'),
                 textStyles = wrapper.styles,
                 width = wrapper.textWidth,
@@ -3529,18 +3539,20 @@
                 }
 
 
-                // remove empty line at end
-                if (lines[lines.length - 1] === '') {
-                    lines.pop();
-                }
+                // Trim empty lines (#5261)
+                lines = grep(lines, function (line) {
+                    return line !== '';
+                });
 
 
                 // build the lines
                 each(lines, function buildTextLines(line, lineNo) {
                     var spans,
                         spanNo = 0;
-
-                    line = line.replace(/<span/g, '|||<span').replace(/<\/span>/g, '</span>|||');
+                    line = line
+                        .replace(/^\s+|\s+$/g, '') // Trim to prevent useless/costly process on the spaces (#5258)
+                        .replace(/<span/g, '|||<span')
+                        .replace(/<\/span>/g, '</span>|||');
                     spans = line.split('|||');
 
                     each(spans, function buildTextSpans(span) {
@@ -3605,7 +3617,6 @@
                                     var words = span.replace(/([^\^])-/g, '$1- ').split(' '), // #1273
                                         hasWhiteSpace = spans.length > 1 || lineNo || (words.length > 1 && textStyles.whiteSpace !== 'nowrap'),
                                         tooLong,
-                                        wasTooLong,
                                         actualWidth,
                                         rest = [],
                                         dy = getLineHeight(tspan),
@@ -3637,9 +3648,6 @@
                                             if (wordStr === '' || (!tooLong && cursor < 0.5)) {
                                                 words = []; // All ok, break out
                                             } else {
-                                                if (tooLong) {
-                                                    wasTooLong = true;
-                                                }
                                                 wordStr = span.substring(0, wordStr.length + (tooLong ? -1 : 1) * mathCeil(cursor));
                                                 words = [wordStr + (width > 3 ? '\u2026' : '')];
                                                 tspan.removeChild(tspan.firstChild);
@@ -3675,9 +3683,6 @@
                                             tspan.appendChild(doc.createTextNode(words.join(' ').replace(/- /g, '-')));
                                         }
                                     }
-                                    if (wasTooLong) {
-                                        wrapper.attr('title', wrapper.textStr);
-                                    }
                                     wrapper.rotation = rotation;
                                 }
 
@@ -3686,6 +3691,10 @@
                         }
                     });
                 });
+
+                if (wasTooLong) {
+                    wrapper.attr('title', wrapper.textStr);
+                }
                 if (tempParent) {
                     tempParent.removeChild(textNode); // attach it to the DOM to read offset width
                 }
@@ -6576,7 +6585,7 @@
             }
 
             // the label is created on init - now move it into place
-            if (label && !isNaN(x)) {
+            if (label && isNumber(x)) {
                 label.xy = xy = tick.getLabelPosition(x, y, label, horiz, labelOptions, tickmarkOffset, index, step);
 
                 // Apply show first and show last. If the tick is both first and last, it is
@@ -6597,7 +6606,7 @@
                 }
 
                 // Set the new position, and show or hide
-                if (show && !isNaN(xy.y)) {
+                if (show && isNumber(xy.y)) {
                     xy.opacity = opacity;
                     label[tick.isNew ? 'attr' : 'animate'](xy);
                     tick.isNew = false;
@@ -7347,8 +7356,20 @@
                     if (axis.isXAxis) {
                         xData = series.xData;
                         if (xData.length) {
-                            axis.dataMin = mathMin(pick(axis.dataMin, xData[0]), arrayMin(xData));
+                            // If xData contains values which is not numbers, then filter them out.
+                            // To prevent performance hit, we only do this after we have already
+                            // found seriesDataMin because in most cases all data is valid. #5234.
+                            seriesDataMin = arrayMin(xData);
+                            if (!isNumber(seriesDataMin) && !(seriesDataMin instanceof Date)) { // Date for #5010
+                                xData = grep(xData, function (x) {
+                                    return isNumber(x);
+                                });
+                                seriesDataMin = arrayMin(xData); // Do it again with valid data
+                            }
+
+                            axis.dataMin = mathMin(pick(axis.dataMin, xData[0]), seriesDataMin);
                             axis.dataMax = mathMax(pick(axis.dataMax, xData[0]), arrayMax(xData));
+                        
                         }
 
                     // Get dataMin and dataMax for Y axes, as well as handle stacking and processed data
@@ -7494,8 +7515,7 @@
             translatedValue = pick(translatedValue, axis.translate(value, null, null, old));
             x1 = x2 = mathRound(translatedValue + transB);
             y1 = y2 = mathRound(cHeight - translatedValue - transB);
-
-            if (isNaN(translatedValue)) { // no min or max
+            if (!isNumber(translatedValue)) { // no min or max
                 skip = true;
 
             } else if (axis.horiz) {
@@ -7862,6 +7882,9 @@
                 axis.range = null;  // don't use it when running setExtremes
             }
 
+            // Hook for Highstock Scroller. Consider combining with beforePadding.
+            fireEvent(axis, 'foundExtremes');
+
             // Hook for adjusting this.min and this.max. Used by bubble series.
             if (axis.beforePadding) {
                 axis.beforePadding();
@@ -8674,6 +8697,7 @@
                 clip,
                 directionFactor = [-1, 1, 1, -1][side],
                 n,
+                textAlign,
                 axisParent = axis.axisParent, // Used in color axis
                 lineHeightCorrection,
                 tickSize = this.tickSize('tick');
@@ -8741,6 +8765,18 @@
 
             if (axisTitleOptions && axisTitleOptions.text && axisTitleOptions.enabled !== false) {
                 if (!axis.axisTitle) {
+                    textAlign = axisTitleOptions.textAlign;
+                    if (!textAlign) {
+                        textAlign = (horiz ? { 
+                            low: 'left',
+                            middle: 'center',
+                            high: 'right'
+                        } : { 
+                            low: opposite ? 'right' : 'left',
+                            middle: 'center',
+                            high: opposite ? 'left' : 'right'
+                        })[axisTitleOptions.align];
+                    }
                     axis.axisTitle = renderer.text(
                         axisTitleOptions.text,
                         0,
@@ -8750,12 +8786,7 @@
                     .attr({
                         zIndex: 7,
                         rotation: axisTitleOptions.rotation || 0,
-                        align: 
-                            axisTitleOptions.textAlign || { 
-                                low: opposite ? 'right' : 'left',
-                                middle: 'center',
-                                high: opposite ? 'left' : 'right'
-                            }[axisTitleOptions.align]
+                        align: textAlign
                     })
                     .addClass(PREFIX + this.coll.toLowerCase() + '-title')
                     .css(axisTitleOptions.style)
@@ -8902,7 +8933,7 @@
                 lineWidth = options.lineWidth,
                 linePath,
                 hasRendered = chart.hasRendered,
-                slideInTicks = hasRendered && defined(axis.oldMin) && !isNaN(axis.oldMin),
+                slideInTicks = hasRendered && isNumber(axis.oldMin),
                 showAxis = axis.showAxis,
                 animation = animObject(renderer.globalAnimation),
                 from,
@@ -9198,6 +9229,7 @@
                         });
                 } else {
                     attribs = {
+                        'pointer-events': 'none', // #5259
                         'stroke-width': strokeWidth,
                         stroke: options.color || (categorized ? 'rgba(155,200,255,0.2)' : '#C0C0C0'),
                         zIndex: pick(options.zIndex, 2)
@@ -10233,7 +10265,7 @@
                     if (p) {
                         // Store both closest points, using point.dist and point.distX comparisons (#4645):
                         each(['dist', 'distX'], function (dist, k) {
-                            if (typeof p[dist] === 'number') {
+                            if (isNumber(p[dist])) {
                                 var
                                     // It is closer than the reference point
                                     isCloser = p[dist] < distance[k],
@@ -10304,7 +10336,7 @@
 
             // Crosshair. For each hover point, loop over axes and draw cross if that point
             // belongs to the axis (#4927).
-            each(shared ? kdpoints : [pick(kdpoint[1], hoverPoint)], function (point) {
+            each(shared ? kdpoints : [pick(hoverPoint, kdpoint[1])], function (point) { // #5269
                 each(chart.axes, function (axis) {
                     // In case of snap = false, point is undefined, and we draw the crosshair anyway (#5066)
                     if (!point || point.series[axis.coll] === axis) {
@@ -10995,10 +11027,10 @@
                     // moved, and cancelling on small distances. #3450.
                     if (e.type === 'touchmove') {
                         pinchDown = this.pinchDown;
-                        hasMoved = Math.sqrt(
+                        hasMoved = pinchDown[0] ? Math.sqrt( // #5266
                             Math.pow(pinchDown[0].chartX - e.chartX, 2) +
                             Math.pow(pinchDown[0].chartY - e.chartY, 2)
-                        ) >= 4;
+                        ) >= 4 : false;
                     }
 
                     if (pick(hasMoved, true)) {
@@ -12169,6 +12201,9 @@
                         redrawLegend = true;
                     }
                 }
+                if (serie.isDirtyData) {
+                    fireEvent(serie, 'updatedData');
+                }
             });
 
             // handle added or removed series
@@ -12395,6 +12430,7 @@
                     })
                     .css(chartTitleOptions.style)
                     .add();
+            
                 }
             });
             chart.layOutTitles(redraw);
@@ -12412,14 +12448,14 @@
                 subtitleOptions = options.subtitle,
                 requiresDirtyBox,
                 renderer = this.renderer,
-                autoWidth = this.spacingBox.width - 44; // 44 makes room for default context button
+                spacingBox = this.spacingBox;
 
             if (title) {
                 title
-                    .css({ width: (titleOptions.width || autoWidth) + PX })
+                    .css({ width: (titleOptions.width || spacingBox.width + titleOptions.widthAdjust) + PX })
                     .align(extend({
                         y: renderer.fontMetrics(titleOptions.style.fontSize, title).b - 3
-                    }, titleOptions), false, 'spacingBox');
+                    }, titleOptions), false, spacingBox);
 
                 if (!titleOptions.floating && !titleOptions.verticalAlign) {
                     titleOffset = title.getBBox().height;
@@ -12427,10 +12463,10 @@
             }
             if (subtitle) {
                 subtitle
-                    .css({ width: (subtitleOptions.width || autoWidth) + PX })
+                    .css({ width: (subtitleOptions.width || spacingBox.width + subtitleOptions.widthAdjust) + PX })
                     .align(extend({
                         y: titleOffset + (titleOptions.margin - 13) + renderer.fontMetrics(subtitleOptions.style.fontSize, title).b
-                    }, subtitleOptions), false, 'spacingBox');
+                    }, subtitleOptions), false, spacingBox);
 
                 if (!subtitleOptions.floating && !subtitleOptions.verticalAlign) {
                     titleOffset = mathCeil(titleOffset + subtitle.getBBox().height);
@@ -12545,7 +12581,7 @@
             // attribute and the SVG contents, but not an interactive chart. So in this case,
             // charts[oldChartIndex] will point to the wrong chart if any (#2609).
             oldChartIndex = pInt(attr(renderTo, indexAttrName));
-            if (!isNaN(oldChartIndex) && charts[oldChartIndex] && charts[oldChartIndex].hasRendered) {
+            if (isNumber(oldChartIndex) && charts[oldChartIndex] && charts[oldChartIndex].hasRendered) {
                 charts[oldChartIndex].destroy();
             }
 
@@ -13473,7 +13509,7 @@
             if (pointValKey) {
                 point.y = point[pointValKey];
             }
-            point.isNull = point.y === null;
+            point.isNull = point.x === null || point.y === null;
 
             // 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
@@ -13497,7 +13533,7 @@
                 i = 0,
                 j = 0;
 
-            if (typeof options === 'number' || options === null) {
+            if (isNumber(options) || options === null) {
                 ret[pointArrayMap[0]] = options;
 
             } else if (isArray(options)) {
@@ -13827,7 +13863,7 @@
         updateParallelArrays: function (point, i) {
             var series = point.series,
                 args = arguments,
-                fn = typeof i === 'number' ?
+                fn = isNumber(i) ?
                     // Insert the value in the given position
                     function (key) {
                         var val = key === 'y' && series.toYData ? series.toYData(point) : point[key];
@@ -14325,7 +14361,7 @@
                 i,
                 j;
 
-            yData = yData || this.stackedYData || this.processedYData;
+            yData = yData || this.stackedYData || this.processedYData || [];
             yDataLength = yData.length;
 
             for (i = 0; i < yDataLength; i++) {
@@ -14403,8 +14439,9 @@
                 }
 
                 // Get the plotX translation
-                point.plotX = plotX = mathMin(mathMax(-1e5, xAxis.translate(xValue, 0, 0, 0, 1, pointPlacement, this.type === 'flags')), 1e5); // #3923
-
+                point.plotX = plotX = correctFloat( // #5236
+                    mathMin(mathMax(-1e5, xAxis.translate(xValue, 0, 0, 0, 1, pointPlacement, this.type === 'flags')), 1e5) // #3923
+                );
 
                 // Calculate the bottom y value for stacked series
                 if (stacking && series.visible && !point.isNull && stack && stack[xValue]) {
@@ -14632,7 +14669,7 @@
                     isInside = point.isInside;
 
                     // only draw the point if y is defined
-                    if (enabled && plotY !== UNDEFINED && !isNaN(plotY) && point.y !== null) {
+                    if (enabled && isNumber(plotY) && point.y !== null) {
 
                         // shortcuts
                         pointAttr = point.pointAttr[point.selected ? SELECT_STATE : NORMAL_STATE] || seriesPointAttr;
@@ -14730,6 +14767,7 @@
                 turboThreshold = seriesOptions.turboThreshold,
                 zones = series.zones,
                 zoneAxis = series.zoneAxis || 'y',
+                zoneColor, 
                 attr,
                 key;
 
@@ -14778,6 +14816,7 @@
                         normalOptions.radius = 0;
                     }
 
+                    zoneColor = null;
                     if (zones.length) {
                         j = 0;
                         threshold = zones[j];
@@ -14785,7 +14824,7 @@
                             threshold = zones[++j];
                         }
 
-                        point.color = point.fillColor = pick(threshold.color, series.color); // #3636, #4267, #4430 - inherit color from series, when color is undefined
+                        point.color = point.fillColor = zoneColor = pick(threshold.color, series.color); // #3636, #4267, #4430 - inherit color from series, when color is undefined
 
                     }
 
@@ -14829,6 +14868,12 @@
                         if (normalOptions.hasOwnProperty('color') && !normalOptions.color) {
                             delete normalOptions.color;
                         }
+
+                        // When zone is set, but series.states.hover.color is not set, apply zone color on hover, #4670: 
+                        if (zoneColor && !stateOptionsHover.fillColor) {
+                            pointStateOptionsHover.fillColor = zoneColor;
+                        }
+
                         pointAttr[NORMAL_STATE] = series.convertAttribs(extend(attr, normalOptions), seriesPointAttr[NORMAL_STATE]);
 
                         // inherit from point normal and series hover
@@ -15386,8 +15431,7 @@
         redraw: function () {
             var series = this,
                 chart = series.chart,
-                wasDirtyData = series.isDirtyData, // cache it here as it is set to false in render, but used after
-                wasDirty = series.isDirty,
+                wasDirty = series.isDirty || series.isDirtyData, // cache it here as it is set to false in render, but used after
                 group = series.group,
                 xAxis = series.xAxis,
                 yAxis = series.yAxis;
@@ -15409,11 +15453,8 @@
 
             series.translate();
             series.render();
-            if (wasDirtyData) {
-                fireEvent(series, 'updatedData');
-            }
-            if (wasDirty || wasDirtyData) {            // #3945 recalculate the kdtree when dirty
-                delete this.kdTree; // #3868 recalculate the kdtree with dirty data
+            if (wasDirty) { // #3868, #3945
+                delete this.kdTree;
             }
         },
 
@@ -17207,7 +17248,7 @@
                     graphic = point.graphic,
                     borderAttr;
 
-                if (plotY !== UNDEFINED && !isNaN(plotY) && point.y !== null) {
+                if (isNumber(plotY) && point.y !== null) {
                     shapeArgs = point.shapeArgs;
 
                     borderAttr = defined(series.borderWidth) ? {
@@ -17264,7 +17305,7 @@
                         // Do the scale synchronously to ensure smooth updating (#5030)
                         step: function (val, fx) {
                             series.group.attr({
-                                scaleY: fx.pos
+                                scaleY: mathMax(0.001, fx.pos) // #5250
                             });
                         }
                     }));
@@ -18015,11 +18056,11 @@
                 rotCorr = chart.renderer.rotCorr(baseline, rotation); // #3723
                 alignAttr = {
                     x: alignTo.x + options.x + alignTo.width / 2 + rotCorr.x,
-                    y: alignTo.y + options.y + alignTo.height / 2
+                    y: alignTo.y + options.y + { top: 0, middle: 0.5, bottom: 1 }[options.verticalAlign] * alignTo.height
                 };
                 dataLabel[isNew ? 'attr' : 'animate'](alignAttr)
                     .attr({ // #3003
-                        align: options.align
+                        align: align
                     });
 
                 // Compensate for the rotated label sticking out on the sides
@@ -18246,7 +18287,7 @@
                         var slotX = series.getX(pos, i) + chart.plotLeft - (i ? 100 : 0),
                             slotY = pos + chart.plotTop;
 
-                        if (!isNaN(slotX)) {
+                        if (isNumber(slotX)) {
                             series.slotElements.push(chart.renderer.rect(slotX, slotY - 7, 100, labelHeight, 1)
                                 .attr({
                                     'stroke-width': 1,

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

@@ -2,7 +2,7 @@
 // @compilation_level SIMPLE_OPTIMIZATIONS
 
 /**
- * @license Highcharts JS v4.2.4 (2016-04-14)
+ * @license Highcharts JS v4.2.5 (2016-05-06)
  *
  * 3D features for Highcharts JS
  *

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

@@ -2,7 +2,7 @@
 // @compilation_level SIMPLE_OPTIMIZATIONS
 
 /**
- * @license Highcharts JS v4.2.4 (2016-04-14)
+ * @license Highcharts JS v4.2.5 (2016-05-06)
  *
  * (c) 2009-2016 Torstein Honsi
  *
@@ -20,6 +20,7 @@ var arrayMin = Highcharts.arrayMin,
         arrayMax = Highcharts.arrayMax,
         each = Highcharts.each,
         extend = Highcharts.extend,
+        isNumber = Highcharts.isNumber,
         merge = Highcharts.merge,
         map = Highcharts.map,
         pick = Highcharts.pick,
@@ -525,6 +526,12 @@ var arrayMin = Highcharts.arrayMin,
 
         }
 
+        // Disable certain features on angular and polar axes
+        if (angular || polar) {
+            chart.inverted = false;
+            chartOptions.chart.zoomType = null;
+        }
+
         // Run prototype.init
         proceed.call(this, chart, userOptions);
 
@@ -542,11 +549,6 @@ var arrayMin = Highcharts.arrayMin,
             );
             paneOptions = pane.options;
 
-
-            // Disable certain features on angular and polar axes
-            chart.inverted = false;
-            chartOptions.chart.zoomType = null;
-
             // Start and end angle options are
             // given in degrees relative to top, while internal computations are
             // in radians relative to right (like SVG).
@@ -1144,7 +1146,7 @@ var arrayMin = Highcharts.arrayMin,
                     rotation = yAxis.startAngleRad + yAxis.translate(point.y, null, null, null, true);
 
                 // Handle the wrap and overshoot options
-                if (overshoot && typeof overshoot === 'number') {
+                if (isNumber(overshoot)) {
                     overshoot = overshoot / 180 * Math.PI;
                     rotation = Math.max(yAxis.startAngleRad - overshoot, Math.min(yAxis.endAngleRad + overshoot, rotation));
 
@@ -2085,7 +2087,7 @@ var arrayMin = Highcharts.arrayMin,
                 point = data[i];
                 radius = radii ? radii[i] : 0; // #1737
 
-                if (typeof radius === 'number' && radius >= this.minPxSize / 2) {
+                if (isNumber(radius) && radius >= this.minPxSize / 2) {
                     // Shape arguments
                     point.shapeType = 'circle';
                     point.shapeArgs = {
@@ -2213,7 +2215,7 @@ var arrayMin = Highcharts.arrayMin,
 
             if (range > 0) {
                 while (i--) {
-                    if (typeof data[i] === 'number' && axis.dataMin <= data[i] && data[i] <= axis.dataMax) {
+                    if (isNumber(data[i]) && axis.dataMin <= data[i] && data[i] <= axis.dataMax) {
                         radius = series.radii[i];
                         pxMin = Math.min(((data[i] - min) * transA) - radius, pxMin);
                         pxMax = Math.max(((data[i] - min) * transA) + radius, pxMax);
@@ -2459,8 +2461,8 @@ var arrayMin = Highcharts.arrayMin,
             // Connect the path
             if (this.chart.polar) {
                 points = points || this.points;
-    
-                if (this.options.connectEnds !== false && points[0].y !== null) {
+
+                if (this.options.connectEnds !== false && points[0] && points[0].y !== null) {
                     this.connectEnds = true; // re-used in splines
                     points.splice(points.length, 0, points[0]);
                 }
@@ -2597,7 +2599,9 @@ var arrayMin = Highcharts.arrayMin,
                         point = points[i];
                         start = point.barX + startAngleRad;
                         point.shapeType = 'path';
-                        point.shapeArgs = this.polarArc(point.yBottom, point.plotY, start, start + point.pointWidth);
+                        point.shapeArgs = {
+                            d: this.polarArc(point.yBottom, point.plotY, start, start + point.pointWidth)
+                        };
                         // Provide correct plotX, plotY for tooltip
                         this.toXY(point);
                         point.tooltipPos = [point.plotX, point.plotY];

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

@@ -67,6 +67,7 @@
         addEvent = H.addEvent,
         fireEvent = H.fireEvent,
         grep = H.grep,
+        isNumber = H.isNumber,
         merge = H.merge,
         pick = H.pick,
         wrap = H.wrap,
@@ -169,8 +170,8 @@
                 data = options.data,
                 xAxis = this.xAxis && this.xAxis.options,
                 yAxis = this.yAxis && this.yAxis.options;
-            return data.length > (options.boostThreshold || Number.MAX_VALUE) && typeof yAxis.min === 'number' && typeof yAxis.max === 'number' &&
-                (!checkX || (typeof xAxis.min === 'number' && typeof xAxis.max === 'number'));
+            return data.length > (options.boostThreshold || Number.MAX_VALUE) && isNumber(yAxis.min) && isNumber(yAxis.max) &&
+                (!checkX || (isNumber(xAxis.min) && isNumber(xAxis.max)));
         },
 
         /**
@@ -275,7 +276,7 @@
                 lastPoint,
                 threshold = options.threshold,
                 yBottom = yAxis.getThreshold(threshold),
-                hasThreshold = typeof threshold === 'number',
+                hasThreshold = isNumber(threshold),
                 translatedThreshold = yBottom,
                 doFill = this.fill,
                 isRange = series.pointArrayMap && series.pointArrayMap.join(',') === 'low,high',

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

@@ -1,5 +1,5 @@
 /**
- * Highcharts JS v4.2.4 (2016-04-14)
+ * Highcharts JS v4.2.5 (2016-05-06)
  * Highcharts Broken Axis module
  * 
  * License: www.highcharts.com/license

data/app/assets/javascripts/highcharts/modules/canvas-tools.js

@@ -2908,7 +2908,7 @@ if (CanvasRenderingContext2D) {
 		});
 	}
 }/**
- * @license Highcharts JS v4.2.4 (2016-04-14)
+ * @license Highcharts JS v4.2.5 (2016-05-06)
  * CanVGRenderer Extension module
  *
  * (c) 2011-2016 Torstein Honsi, Erik Olsson

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

@@ -1,5 +1,5 @@
 /**
- * @license Highcharts JS v4.2.4 (2016-04-14)
+ * @license Highcharts JS v4.2.5 (2016-05-06)
  * Data module
  *
  * (c) 2012-2016 Torstein Honsi
@@ -22,6 +22,7 @@
 		each = Highcharts.each,
 		pick = Highcharts.pick,
 		inArray = Highcharts.inArray,
+		isNumber = Highcharts.isNumber,
 		splat = Highcharts.splat,
 		SeriesBuilder;
 	
@@ -424,7 +425,7 @@
 				} else {
 					dateVal = this.parseDate(val);
 					// Only allow parsing of dates if this column is an x-column
-					if (isXColumn && typeof dateVal === 'number' && !isNaN(dateVal) && columnType !== 'float') { // is date
+					if (isXColumn && isNumber(dateVal) && columnType !== 'float') { // is date
 						backup[row] = val; 
 						column[row] = dateVal;
 						column.isDatetime = true;
@@ -557,7 +558,7 @@
 						ret = match.getTime() - match.getTimezoneOffset() * 60000;
 					
 					// Timestamp
-					} else if (typeof match === 'number' && !isNaN(match)) {
+					} else if (isNumber(match)) {
 						ret = match - (new Date(match)).getTimezoneOffset() * 60000;
 					}
 				}

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

@@ -1,5 +1,5 @@
 /**
- * @license Highcharts JS v4.2.4 (2016-04-14)
+ * @license Highcharts JS v4.2.5 (2016-05-06)
  * Exporting module
  *
  * (c) 2010-2016 Torstein Honsi
@@ -104,6 +104,7 @@ defaultOptions.exporting = {
 	type: 'image/png',
 	url: 'http://export.highcharts.com/',
 	//width: undefined,
+	printMaxWidth: 780,
 	//scale: 2
 	buttons: {
 		contextButton: {
@@ -424,7 +425,11 @@ extend(Chart.prototype, {
 			origDisplay = [],
 			origParent = container.parentNode,
 			body = doc.body,
-			childNodes = body.childNodes;
+			childNodes = body.childNodes,
+			printMaxWidth = chart.options.exporting.printMaxWidth,
+			hasUserSize,
+			resetParams,
+			handleMaxWidth;
 
 		if (chart.isPrinting) { // block the button while in printing mode
 			return;
@@ -435,6 +440,14 @@ extend(Chart.prototype, {
 
 		fireEvent(chart, 'beforePrint');
 
+		// Handle printMaxWidth
+		handleMaxWidth = printMaxWidth && chart.chartWidth > printMaxWidth;
+		if (handleMaxWidth) {
+			hasUserSize = chart.hasUserSize;
+			resetParams = [chart.chartWidth, chart.chartHeight, false];
+			chart.setSize(printMaxWidth, chart.chartHeight, false);
+		}
+
 		// hide all body content
 		each(childNodes, function (node, i) {
 			if (node.nodeType === 1) {
@@ -465,6 +478,12 @@ extend(Chart.prototype, {
 
 			chart.isPrinting = false;
 
+			// Reset printMaxWidth
+			if (handleMaxWidth) {
+				chart.setSize.apply(chart, resetParams);
+				chart.hasUserSize = hasUserSize;
+			}
+
 			fireEvent(chart, 'afterPrint');
 
 		}, 1000);

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

@@ -1,5 +1,5 @@
 /**
- * @license Highcharts JS v4.2.4 (2016-04-14)
+ * @license Highcharts JS v4.2.5 (2016-05-06)
  *
  * (c) 2011-2016 Torstein Honsi
  *
@@ -28,6 +28,7 @@
         each = Highcharts.each,
         extend = Highcharts.extend,
         extendClass = Highcharts.extendClass,
+        isNumber = Highcharts.isNumber,
         merge = Highcharts.merge,
         pick = Highcharts.pick,
         seriesTypes = Highcharts.seriesTypes,
@@ -383,7 +384,7 @@
             }
         },
         getPlotLinePath: function (a, b, c, d, pos) {
-            return typeof pos === 'number' ? // crosshairs only // #3969 pos can be 0 !!
+            return isNumber(pos) ? // crosshairs only // #3969 pos can be 0 !!
                 (this.horiz ?
                     ['M', pos - 4, this.top - 6, 'L', pos + 4, this.top - 6, pos, this.top, 'Z'] :
                     ['M', this.left, pos, 'L', this.left - 6, pos + 6, this.left - 6, pos - 6, 'Z']
@@ -663,10 +664,10 @@
             each(series.points, function (point) {
                 var xPad = (options.colsize || 1) / 2,
                     yPad = (options.rowsize || 1) / 2,
-                    x1 = between(Math.round(xAxis.len - xAxis.translate(point.x - xPad, 0, 1, 0, 1)), 0, xAxis.len),
-                    x2 = between(Math.round(xAxis.len - xAxis.translate(point.x + xPad, 0, 1, 0, 1)), 0, xAxis.len),
-                    y1 = between(Math.round(yAxis.translate(point.y - yPad, 0, 1, 0, 1)), 0, yAxis.len),
-                    y2 = between(Math.round(yAxis.translate(point.y + yPad, 0, 1, 0, 1)), 0, yAxis.len);
+                    x1 = between(Math.round(xAxis.len - xAxis.translate(point.x - xPad, 0, 1, 0, 1)), -xAxis.len, 2 * xAxis.len),
+                    x2 = between(Math.round(xAxis.len - xAxis.translate(point.x + xPad, 0, 1, 0, 1)), -xAxis.len, 2 * xAxis.len),
+                    y1 = between(Math.round(yAxis.translate(point.y - yPad, 0, 1, 0, 1)), -yAxis.len, 2 * yAxis.len),
+                    y2 = between(Math.round(yAxis.translate(point.y + yPad, 0, 1, 0, 1)), -yAxis.len, 2 * yAxis.len);
 
                 // Set plotX and plotY for use in K-D-Tree and more
                 point.plotX = point.clientX = (x1 + x2) / 2;
@@ -694,7 +695,7 @@
         animate: noop,
         getBox: noop,
         drawLegendSymbol: LegendSymbolMixin.drawRectangle,
-
+        alignDataLabel: seriesTypes.column.prototype.alignDataLabel,
         getExtremes: function () {
             // Get the extremes from the value data
             Series.prototype.getExtremes.call(this, this.valueData);

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

@@ -1,5 +1,5 @@
 /**
- * @license Highcharts JS v4.2.4 (2016-04-14)
+ * @license Highcharts JS v4.2.5 (2016-05-06)
  * Plugin for displaying a message when there is no data visible in chart.
  *
  * (c) 2010-2016 Highsoft AS

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

@@ -1,5 +1,5 @@
 /**
- * @license Highcharts JS v4.2.4 (2016-04-14)
+ * @license Highcharts JS v4.2.5 (2016-05-06)
  * Client side exporting module
  *
  * (c) 2015 Torstein Honsi / Oystein Moseng
@@ -68,8 +68,8 @@
 			},
 			// Get data:URL from image URL
 			// Pass in callbacks to handle results. finallyCallback is always called at the end of the process. Supplying this callback is optional.
-			// All callbacks receive two arguments: imageURL, and callbackArgs. callbackArgs is used only by callbacks and can contain whatever.
-			imageToDataUrl = function (imageURL, callbackArgs, successCallback, taintedCallback, noCanvasSupportCallback, failedLoadCallback, finallyCallback) {
+			// All callbacks receive three arguments: imageURL, imageType, and callbackArgs. callbackArgs is used only by callbacks and can contain whatever.
+			imageToDataUrl = function (imageURL, imageType, callbackArgs, successCallback, taintedCallback, noCanvasSupportCallback, failedLoadCallback, finallyCallback) {
 				var img = new win.Image(),
 					taintedHandler,
 					loadHandler = function () {
@@ -78,7 +78,7 @@
 							dataURL;
 						try {
 							if (!ctx) {
-								noCanvasSupportCallback(imageURL, callbackArgs);
+								noCanvasSupportCallback(imageURL, imageType, callbackArgs);
 							} else {
 								canvas.height = img.height * scale;
 								canvas.width = img.width * scale;
@@ -86,12 +86,12 @@
 
 								// Now we try to get the contents of the canvas.
 								try {
-									dataURL = canvas.toDataURL();
-									successCallback(dataURL, callbackArgs);
+									dataURL = canvas.toDataURL(imageType);
+									successCallback(dataURL, imageType, callbackArgs);
 								} catch (e) {
 									// Failed - either tainted canvas or something else went horribly wrong
 									if (e.name === 'SecurityError' || e.name === 'SECURITY_ERR' || e.message === 'SecurityError') {
-										taintedHandler(imageURL, callbackArgs);
+										taintedHandler(imageURL, imageType, callbackArgs);
 									} else {
 										throw e;
 									}
@@ -99,15 +99,15 @@
 							}
 						} finally {
 							if (finallyCallback) {
-								finallyCallback(imageURL, callbackArgs);
+								finallyCallback(imageURL, imageType, callbackArgs);
 							}
 						}
 					},
 					// Image load failed (e.g. invalid URL)
 					errorHandler = function () {
-						failedLoadCallback(imageURL, callbackArgs);
+						failedLoadCallback(imageURL, imageType, callbackArgs);
 						if (finallyCallback) {
-							finallyCallback(imageURL, callbackArgs);
+							finallyCallback(imageURL, imageType, callbackArgs);
 						}
 					};
 				
@@ -176,10 +176,12 @@
 			initiateDownload = function () {
 				var svgurl,
 					blob,
+					imageType = options && options.type || 'image/png',
+					imageExtension = imageType.split('/')[1],
 					svg = chart.sanitizeSVG(chartCopyContainer.innerHTML); // SVG of chart copy
 
 				// Initiate download depending on file type
-				if (options && options.type === 'image/svg+xml') {
+				if (imageType === 'image/svg+xml') {
 					// SVG download. In this case, we want to use Microsoft specific Blob if available
 					try {
 						if (nav.msSaveOrOpenBlob) {
@@ -194,14 +196,14 @@
 						fallbackToExportServer();
 					}
 				} else {
-					// PNG download - create bitmap from SVG
+					// PNG/JPEG download - create bitmap from SVG
 					
 					// First, try to get PNG by rendering on canvas
 					svgurl = svgToDataUrl(svg);
-					imageToDataUrl(svgurl, { /* args */ }, function (imageURL) {
+					imageToDataUrl(svgurl, imageType, { /* args */ }, function (imageURL) {
 						// Success
 						try {
-							download(imageURL, 'png');
+							download(imageURL, imageExtension);
 						} catch (e) {
 							fallbackToExportServer();
 						}
@@ -215,7 +217,7 @@
 							downloadWithCanVG = function () {
 								ctx.drawSvg(svg, 0, 0, imageWidth, imageHeight);
 								try {
-									download(nav.msSaveOrOpenBlob ? canvas.msToBlob() : canvas.toDataURL('image/png'), 'png');
+									download(nav.msSaveOrOpenBlob ? canvas.msToBlob() : canvas.toDataURL(imageType), imageExtension);
 								} catch (e) {
 									fallbackToExportServer();
 								}
@@ -250,7 +252,7 @@
 				}
 			},
 			// Success handler, we converted image to base64!
-			embeddedSuccess = function (imageURL, callbackArgs) {
+			embeddedSuccess = function (imageURL, imageType, callbackArgs) {
 				++imagesEmbedded;
 
 				// Change image href in chart copy
@@ -281,7 +283,7 @@
 			// Go through the images we want to embed
 			for (i = 0, l = images.length; i < l; ++i) {
 				el = images[i];
-				imageToDataUrl(el.getAttributeNS('http://www.w3.org/1999/xlink', 'href'), { imageElement: el },
+				imageToDataUrl(el.getAttributeNS('http://www.w3.org/1999/xlink', 'href'), 'image/png', { imageElement: el },
 					embeddedSuccess,
 					// Tainted canvas
 					fallbackToExportServer,
@@ -309,6 +311,13 @@
 		onclick: function () {
 			this.exportChartLocal();
 		}
+	}, {
+		textKey: 'downloadJPEG',
+		onclick: function () {
+			this.exportChartLocal({
+				type: 'image/jpeg'
+			});
+		}
 	}, {
 		textKey: 'downloadSVG',
 		onclick: function () {

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

@@ -1,5 +1,5 @@
 /**
- * @license  Highcharts JS v4.2.4 (2016-04-14)
+ * @license  Highcharts JS v4.2.5 (2016-05-06)
  * Solid angular gauge module
  *
  * (c) 2010-2016 Torstein Honsi
@@ -20,6 +20,7 @@
 		pInt = H.pInt,
 		pick = H.pick,
 		each = H.each,
+		isNumber = H.isNumber,
 		colorAxisMethods,
 		UNDEFINED;
 
@@ -191,7 +192,7 @@
 				options = series.options,
 				renderer = series.chart.renderer,
 				overshoot = options.overshoot,
-				overshootVal = overshoot && typeof overshoot === 'number' ? overshoot / 180 * Math.PI : 0;
+				overshootVal = isNumber(overshoot) ? overshoot / 180 * Math.PI : 0;
 
 			H.each(series.points, function (point) {
 				var graphic = point.graphic,

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

@@ -1,5 +1,5 @@
 /**
- * @license Highcharts JS v4.2.4 (2016-04-14)
+ * @license Highcharts JS v4.2.5 (2016-05-06)
  *
  * (c) 2014 Highsoft AS
  * Authors: Jon Arild Nygard / Oystein Moseng

data/app/assets/javascripts/highcharts/themes/dark-unica.js

@@ -5,7 +5,7 @@
 
 // Load the fonts
 Highcharts.createElement('link', {
-	href: '//fonts.googleapis.com/css?family=Unica+One',
+	href: 'https://fonts.googleapis.com/css?family=Unica+One',
 	rel: 'stylesheet',
 	type: 'text/css'
 }, null, document.getElementsByTagName('head')[0]);

data/app/assets/javascripts/highcharts/themes/grid-light.js

@@ -5,7 +5,7 @@
 
 // Load the fonts
 Highcharts.createElement('link', {
-	href: '//fonts.googleapis.com/css?family=Dosis:400,600',
+	href: 'https://fonts.googleapis.com/css?family=Dosis:400,600',
 	rel: 'stylesheet',
 	type: 'text/css'
 }, null, document.getElementsByTagName('head')[0]);

data/app/assets/javascripts/highcharts/themes/sand-signika.js

@@ -5,7 +5,7 @@
 
 // Load the fonts
 Highcharts.createElement('link', {
-	href: '//fonts.googleapis.com/css?family=Signika:400,700',
+	href: 'https://fonts.googleapis.com/css?family=Signika:400,700',
 	rel: 'stylesheet',
 	type: 'text/css'
 }, null, document.getElementsByTagName('head')[0]);

data/lib/highcharts/version.rb

@@ -1,3 +1,3 @@
 module Highcharts
-  VERSION = "4.2.4"
+  VERSION = "4.2.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: highcharts-rails
 version: !ruby/object:Gem::Version
-  version: 4.2.4
+  version: 4.2.5
 platform: ruby
 authors:
 - Per Christian B. Viken