highcharts-rails 4.1.4 → 4.1.5

data/app/assets/javascripts/highcharts/adapters/standalone-framework.js

@@ -1,5 +1,5 @@
 /**
- * @license Highcharts JS v4.1.4 (2015-03-10)
+ * @license Highcharts JS v4.1.5 (2015-04-13)
  *
  * Standalone Highcharts Framework
  *

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

@@ -2,7 +2,7 @@
 // @compilation_level SIMPLE_OPTIMIZATIONS
 
 /**
- * @license Highcharts JS v4.1.4 (2015-03-10)
+ * @license Highcharts JS v4.1.5 (2015-04-13)
  *
  * (c) 2009-2013 Torstein Hønsi
  *
@@ -849,7 +849,9 @@ Highcharts.wrap(Highcharts.seriesTypes.column.prototype, 'translate', function (
 			tooltipPos = perspective([{ x: tooltipPos[0], y: tooltipPos[1], z: z }], chart, false)[0];
 			point.tooltipPos = [tooltipPos.x, tooltipPos.y];
 		}
-	});	    
+	});
+	// store for later use #4067
+	series.z = z;
 });
 
 Highcharts.wrap(Highcharts.seriesTypes.column.prototype, 'animate', function (proceed) {
@@ -929,14 +931,15 @@ function draw3DPoints(proceed) {
 	// Do not do this if the chart is not 3D
 	if (this.chart.is3d()) {		
 		var grouping = this.chart.options.plotOptions.column.grouping;
-		if (grouping !== undefined && !grouping && this.group.zIndex !== undefined) {
+		if (grouping !== undefined && !grouping && this.group.zIndex !== undefined && !this.zIndexSet) {
 			this.group.attr({zIndex : (this.group.zIndex * 10)});
+			this.zIndexSet = true; // #4062 set zindex only once
 		} 
 
 		var options = this.options,
 			states = this.options.states;
 			
-		this.borderWidth = options.borderWidth = options.edgeWidth || 1;
+		this.borderWidth = options.borderWidth = defined(options.edgeWidth) ? options.edgeWidth : 1; //#4055
 
 		Highcharts.each(this.data, function (point) {
 			if (point.y !== null) {
@@ -965,7 +968,7 @@ Highcharts.wrap(Highcharts.Series.prototype, 'alignDataLabel', function (proceed
 		var args = arguments,
 			alignTo = args[4];
 		
-		var pos = ({x: alignTo.x, y: alignTo.y, z: 0});
+		var pos = ({x: alignTo.x, y: alignTo.y, z: series.z});
 		pos = perspective([pos], chart, true)[0];
 		alignTo.x = pos.x;
 		alignTo.y = pos.y;

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

@@ -2,7 +2,7 @@
 // @compilation_level SIMPLE_OPTIMIZATIONS
 
 /**
- * @license Highcharts JS v4.1.4 (2015-03-10)
+ * @license Highcharts JS v4.1.5 (2015-04-13)
  *
  * (c) 2009-2014 Torstein Honsi
  *
@@ -1563,8 +1563,6 @@ seriesTypes.waterfall = extendClass(seriesTypes.column, {
 
 	upColorProp: 'fill',
 
-	pointArrayMap: ['low', 'y'],
-
 	pointValKey: 'y',
 
 	/**
@@ -1639,6 +1637,11 @@ seriesTypes.waterfall = extendClass(seriesTypes.column, {
 				}
 				previousY += yValue;
 			}
+			// #3952 Negative sum or intermediate sum not rendered correctly
+			if (shapeArgs.height < 0) {
+				shapeArgs.y += shapeArgs.height;
+				shapeArgs.height *= -1;
+			}
 
 			point.plotY = shapeArgs.y = mathRound(shapeArgs.y) - (series.borderWidth % 2) / 2;
 			shapeArgs.height = mathMax(mathRound(shapeArgs.height), 0.001); // #3151
@@ -2141,7 +2144,10 @@ Axis.prototype.beforePadding = function () {
 		pointerProto = Pointer.prototype,
 		colProto;
 
-	seriesProto.searchPolarPoint = function (e) {
+	/**
+	 * Search a k-d tree by the point angle, used for shared tooltips in polar charts
+	 */
+	seriesProto.searchPointByAngle = function (e) {
 		var series = this,
 			chart = series.chart,
 			xAxis = series.xAxis,
@@ -2149,28 +2155,28 @@ Axis.prototype.beforePadding = function () {
 			plotX = e.chartX - center[0] - chart.plotLeft,
 			plotY = e.chartY - center[1] - chart.plotTop;
 
-		this.kdAxisArray = ['clientX'];
-		e = {
+		return this.searchKDTree({
 			clientX: 180 + (Math.atan2(plotX, plotY) * (-180 / Math.PI))
-		};
-		return this.searchKDTree(e);
+		});
 
 	};
 	
+	/**
+	 * Wrap the buildKDTree function so that it searches by angle (clientX) in case of shared tooltip,
+	 * and by two dimensional distance in case of non-shared.
+	 */
 	wrap(seriesProto, 'buildKDTree', function (proceed) {
 		if (this.chart.polar) {
-			this.kdAxisArray = ['clientX'];
+			if (this.kdByAngle) {
+				this.searchPoint = this.searchPointByAngle;
+			} else {
+				this.kdDimensions = 2;
+				this.kdComparer = 'distR';
+			}
 		}
 		proceed.apply(this);
 	});
-	
-	wrap(seriesProto, 'searchPoint', function (proceed, e) {
-		if (this.chart.polar) {
-			return this.searchPolarPoint(e);
-		} else {
-			return proceed.call(this, e);
-		}
-	});
+
 	/**
 	 * Translate a point's plotX and plotY from the internal angle and radius measures to 
 	 * true plotX, plotY coordinates
@@ -2186,18 +2192,22 @@ Axis.prototype.beforePadding = function () {
 		point.rectPlotX = plotX;
 		point.rectPlotY = plotY;
 	
-		// Record the angle in degrees for use in tooltip
-		clientX = ((plotX / Math.PI * 180) + this.xAxis.pane.options.startAngle) % 360;
-		if (clientX < 0) { // #2665
-			clientX += 360;
-		}
-		point.clientX = clientX;
-
-	
 		// Find the polar plotX and plotY
 		xy = this.xAxis.postTranslate(point.plotX, this.yAxis.len - plotY);
 		point.plotX = point.polarPlotX = xy.x - chart.plotLeft;
 		point.plotY = point.polarPlotY = xy.y - chart.plotTop;
+
+		// If shared tooltip, record the angle in degrees in order to align X points. Otherwise,
+		// use a standard k-d tree to get the nearest point in two dimensions.
+		if (this.kdByAngle) {
+			clientX = ((plotX / Math.PI * 180) + this.xAxis.pane.options.startAngle) % 360;
+			if (clientX < 0) { // #2665
+				clientX += 360;
+			}
+			point.clientX = clientX;
+		} else {
+			point.clientX = point.plotX;
+		}
 	};
 
 	/**
@@ -2345,17 +2355,25 @@ Axis.prototype.beforePadding = function () {
 	 * center. 
 	 */
 	wrap(seriesProto, 'translate', function (proceed) {
-		
+		var chart = this.chart,
+			points,
+			i;
+
 		// Run uber method
 		proceed.call(this);
 	
 		// Postprocess plot coordinates
-		if (this.chart.polar && !this.preventPostTranslate) {
-			var points = this.points,
+		if (chart.polar) {
+			this.kdByAngle = chart.tooltip.shared;
+	
+			if (!this.preventPostTranslate) {
+				points = this.points;
 				i = points.length;
-			while (i--) {
-				// Translate plotX, plotY from angle and radius to true plot coordinates
-				this.toXY(points[i]);
+
+				while (i--) {
+					// Translate plotX, plotY from angle and radius to true plot coordinates
+					this.toXY(points[i]);
+				}
 			}
 		}
 	});

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

@@ -1,5 +1,5 @@
 /**
- * Highcharts JS v4.1.4 (2015-03-10)
+ * Highcharts JS v4.1.5 (2015-04-13)
  * Highcharts Broken Axis module
  * 
  * Author: Stephane Vanraes, Torstein Honsi

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

@@ -2908,7 +2908,7 @@ if (CanvasRenderingContext2D) {
 		});
 	}
 }/**
- * @license Highcharts JS v4.1.4 (2015-03-10)
+ * @license Highcharts JS v4.1.5 (2015-04-13)
  * CanVGRenderer Extension module
  *
  * (c) 2011-2012 Torstein Honsi, Erik Olsson

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

@@ -1,5 +1,5 @@
 /**
- * @license Highcharts JS v4.1.4 (2015-03-10)
+ * @license Highcharts JS v4.1.5 (2015-04-13)
  * Data module
  *
  * (c) 2012-2014 Torstein Honsi

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

@@ -23,9 +23,9 @@
 		seriesTypes = H.seriesTypes,
 		PieSeries = seriesTypes.pie,
 		ColumnSeries = seriesTypes.column,
+		Tick = H.Tick,
 		fireEvent = HighchartsAdapter.fireEvent,
 		inArray = HighchartsAdapter.inArray,
-		dupes = [],
 		ddSeriesId = 1;
 
 	// Utilities
@@ -42,8 +42,7 @@
 
 		// Unsupported color, return to-color (#3920)
 		if (!to.rgba.length || !from.rgba.length) {
-			Highcharts.error(23);
-			ret = to.raw;
+			ret = to.raw || 'none';
 
 		// Interpolate
 		} else {
@@ -128,9 +127,21 @@
 			levelSeries = [],
 			levelSeriesOptions = [],
 			level,
-			levelNumber;
+			levelNumber,
+			last;
 
+		if (!this.drilldownLevels) {
+			this.drilldownLevels = [];
+		}
+		
 		levelNumber = oldSeries.options._levelNumber || 0;
+
+		// See if we can reuse the registered series from last run
+		last = this.drilldownLevels[this.drilldownLevels.length - 1];
+		if (last && last.levelNumber !== levelNumber) {
+			last = undefined;
+		}
+		
 			
 		ddOptions = extend({
 			color: color,
@@ -140,12 +151,18 @@
 
 		// Record options for all current series
 		each(oldSeries.chart.series, function (series) {
-			if (series.xAxis === xAxis) {
-				levelSeries.push(series);
+			if (series.xAxis === xAxis && !series.isDrilling) {
 				series.options._ddSeriesId = series.options._ddSeriesId || ddSeriesId++;
 				series.options._colorIndex = series.userOptions._colorIndex;
-				levelSeriesOptions.push(series.options);
 				series.options._levelNumber = series.options._levelNumber || levelNumber; // #3182
+
+				if (last) {
+					levelSeries = last.levelSeries;
+					levelSeriesOptions = last.levelSeriesOptions;
+				} else {
+					levelSeries.push(series);
+					levelSeriesOptions.push(series.options);
+				}
 			}
 		});
 
@@ -169,10 +186,7 @@
 			}
 		};
 
-		// Generate and push it to a lookup array
-		if (!this.drilldownLevels) {
-			this.drilldownLevels = [];
-		}
+		// Push it to the lookup array
 		this.drilldownLevels.push(level);
 
 		newSeries = level.lowerSeries = this.addSeries(ddOptions, false);
@@ -298,7 +312,8 @@
 				if (!oldSeries.chart) {  // #2786
 					seriesI = chartSeries.length; // #2919
 					while (seriesI--) {
-						if (chartSeries[seriesI].options.id === level.lowerSeriesOptions.id) {
+						if (chartSeries[seriesI].options.id === level.lowerSeriesOptions.id && 
+								chartSeries[seriesI].options._levelNumber === levelNumber + 1) { // #3867
 							oldSeries = chartSeries[seriesI];
 							break;
 						}
@@ -342,7 +357,7 @@
 			.align();
 		}
 
-		dupes.length = []; // #3315
+		this.ddDupes.length = []; // #3315
 	};
 
 
@@ -513,11 +528,15 @@
 			drilldown = chart.options.drilldown,
 			i = (drilldown.series || []).length,
 			seriesOptions;
+
+		if (!chart.ddDupes) {
+			chart.ddDupes = [];
+		}
 		
 		while (i-- && !seriesOptions) {
-			if (drilldown.series[i].id === this.drilldown && inArray(this.drilldown, dupes) === -1) {
+			if (drilldown.series[i].id === this.drilldown && inArray(this.drilldown, chart.ddDupes) === -1) {
 				seriesOptions = drilldown.series[i];
-				dupes.push(this.drilldown);
+				chart.ddDupes.push(this.drilldown);
 			}
 		}
 
@@ -527,7 +546,7 @@
 			point: this,
 			seriesOptions: seriesOptions,
 			category: category,
-			points: category !== undefined && this.series.xAxis.ticks[category].label.ddPoints.slice(0)
+			points: category !== undefined && this.series.xAxis.ddPoints[category].slice(0)
 		});
 		
 		if (seriesOptions) {
@@ -543,13 +562,70 @@
 	 * Drill down to a given category. This is the same as clicking on an axis label.
 	 */
 	H.Axis.prototype.drilldownCategory = function (x) {
-		each(this.ticks[x].label.ddPoints, function (point) {
-			if (point.series && point.series.visible && point.doDrilldown) { // #3197
+		var key,
+			point,
+			ddPointsX = this.ddPoints[x];
+		for (key in ddPointsX) {
+			point = ddPointsX[key];
+			if (point && point.series && point.series.visible && point.doDrilldown) { // #3197
 				point.doDrilldown(true, x);
 			}
-		});
+		}
 		this.chart.applyDrilldown();
 	};
+
+	/**
+	 * Create and return a collection of points associated with the X position. Reset it for each level.
+	 */	
+	H.Axis.prototype.getDDPoints = function (x, levelNumber) {
+		var ddPoints = this.ddPoints;
+		if (!ddPoints) {
+			this.ddPoints = ddPoints = {};
+		}
+		if (!ddPoints[x]) {
+			ddPoints[x] = [];
+		}
+		if (ddPoints[x].levelNumber !== levelNumber) {
+			ddPoints[x].length = 0; // reset
+		}
+		return ddPoints[x];
+	};
+
+
+	/**
+	 * Make a tick label drillable, or remove drilling on update
+	 */
+	Tick.prototype.drillable = function () {
+		var pos = this.pos,
+			label = this.label,
+			axis = this.axis,
+			ddPointsX = axis.ddPoints && axis.ddPoints[pos];
+
+		if (label && ddPointsX && ddPointsX.length) {
+			if (!label.basicStyles) {
+				label.basicStyles = H.merge(label.styles);
+			}
+			label
+				.addClass('highcharts-drilldown-axis-label')
+				.css(axis.chart.options.drilldown.activeAxisLabelStyle)
+				.on('click', function () {
+					axis.drilldownCategory(pos);
+				});
+
+		} else if (label && label.basicStyles) {
+			label.styles = {}; // reset for full overwrite of styles
+			label.css(label.basicStyles);
+			label.on('click', null); // #3806			
+		}
+	};
+
+	/**
+	 * Always keep the drillability updated (#3951)
+	 */
+	wrap(Tick.prototype, 'addLabel', function (proceed) {
+		proceed.call(this);
+		this.drillable();
+	});
 	
 
 	/**
@@ -558,20 +634,10 @@
 	 */
 	wrap(H.Point.prototype, 'init', function (proceed, series, options, x) {
 		var point = proceed.call(this, series, options, x),
-			chart = series.chart,
-			tick = series.xAxis && series.xAxis.ticks[x],
-			tickLabel = tick && tick.label;
+			xAxis = series.xAxis,
+			tick = xAxis && xAxis.ticks[x],
+			ddPointsX = xAxis && xAxis.getDDPoints(x, series.options._levelNumber);
 
-		// Create a collection of points associated with the label. Reset it for each level.
-		if (tickLabel) {
-			if (!tickLabel.ddPoints) {
-				tickLabel.ddPoints = [];
-			}
-			if (tickLabel.levelNumber !== series.options._levelNumber) {
-				tickLabel.ddPoints.length = 0; // reset
-			}
-		}				
-		
 		if (point.drilldown) {
 			
 			// Add the click event to the point 
@@ -587,26 +653,18 @@
 				}
 			});*/
 
-			// Make axis labels clickable
-			if (tickLabel) {
-				if (!tickLabel.basicStyles) {
-					tickLabel.basicStyles = H.merge(tickLabel.styles);
-				}
-				tickLabel
-					.addClass('highcharts-drilldown-axis-label')
-					.css(chart.options.drilldown.activeAxisLabelStyle)
-					.on('click', function () {
-						series.xAxis.drilldownCategory(x);
-					});
-				
-				tickLabel.ddPoints.push(point);
-				tickLabel.levelNumber = series.options._levelNumber;
-					
+
+			// Register drilldown points on this X value
+			if (ddPointsX) {
+				ddPointsX.push(point);
+				ddPointsX.levelNumber = series.options._levelNumber;
 			}
-		} else if (tickLabel && tickLabel.basicStyles && tickLabel.levelNumber !== series.options._levelNumber) {
-			tickLabel.styles = {}; // reset for full overwrite of styles
-			tickLabel.css(tickLabel.basicStyles);
-			tickLabel.on('click', null); // #3806			
+
+		}
+
+		// Add or remove click handler and style on the tick label
+		if (tick) {
+			tick.drillable();
 		}
 
 		return point;
@@ -623,10 +681,7 @@
 					.attr({
 						'class': 'highcharts-drilldown-data-label'
 					})
-					.css(css)
-					.on('click', function () {
-						point.doDrilldown();
-					});
+					.css(css);
 			}
 		});
 	});