highcharts-rails 4.1.8 → 4.1.9

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

@@ -1,5 +1,5 @@
 /**
- * @license Highcharts JS v4.1.8 (2015-08-20)
+ * @license Highcharts JS v4.1.9 (2015-10-07)
  *
  * Standalone Highcharts Framework
  *
@@ -14,7 +14,6 @@ var UNDEFINED,
 	doc = document,
 	emptyArray = [],
 	timers = [],
-	timerId,
 	animSetters = {},
 	Fx;
 
@@ -337,7 +336,7 @@ return {
 				t.elem = this.elem;
 
 				if (t() && timers.push(t) === 1) {
-					timerId = setInterval(function () {
+					t.timerId = setInterval(function () {
 						
 						for (i = 0; i < timers.length; i++) {
 							if (!timers[i]()) {
@@ -346,7 +345,7 @@ return {
 						}
 
 						if (!timers.length) {
-							clearInterval(timerId);
+							clearInterval(t.timerId);
 						}
 					}, 13);
 				}
@@ -360,7 +359,7 @@ return {
 					elem = this.elem,
 					i;
 				
-				if (elem.stopAnimation || (elem.attr && !elem.element)) { // #2616, element including flag is destroyed
+				if (elem.attr && !elem.element) { // #2616, element including flag is destroyed
 					ret = false;
 
 				} else if (gotoEnd || t >= options.duration + this.startTime) {
@@ -408,8 +407,6 @@ return {
 				name,
 				PX = 'px';
 
-			el.stopAnimation = false; // ready for new
-
 			if (typeof opt !== 'object' || opt === null) {
 				args = arguments;
 				opt = {
@@ -592,7 +589,17 @@ return {
 	 * Stop running animation
 	 */
 	stop: function (el) {
-		el.stopAnimation = true;
+
+		var i = timers.length,
+			timer;
+
+		// Remove timers related to this element (#4519)
+		while (i--) {
+			timer = timers[i];
+			if (timer.elem === el) {
+				timers.splice(i, 1);
+			}
+		}
 	},
 
 	/**

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

@@ -2,7 +2,7 @@
 // @compilation_level SIMPLE_OPTIMIZATIONS
 
 /**
- * @license Highcharts JS v4.1.8 (2015-08-20)
+ * @license Highcharts JS v4.1.9 (2015-10-07)
  *
  * (c) 2009-2013 Torstein Hønsi
  *
@@ -501,6 +501,23 @@ Highcharts.SVGRenderer.prototype.arc3dPath = function (shapeArgs) {
 	
 	var out = ['M', cx + (rx * cos(start2)), cy + (ry * sin(start2))];
 	out = out.concat(curveTo(cx, cy, rx, ry, start2, end2, 0, 0));
+	
+	// When slice goes over middle, need to add both, left and right outer side:
+	if (end > PI - a && start < PI - a) {
+	// Go to outer side
+	out = out.concat([
+	'L', cx + (rx * cos(end2)) + dx, cy + (ry * sin(end2)) + dy
+	]);
+	// Curve to the true end of the slice
+	out = out.concat(curveTo(cx, cy, rx, ry, end2, end, dx, dy));
+	// Go to the inner side
+	out = out.concat([
+	'L', cx + (rx * cos(end)), cy + (ry * sin(end))
+	]);
+	// Go back to the artifical end2
+	out = out.concat(curveTo(cx, cy, rx, ry, end, end2, 0, 0));
+	}
+	
 	out = out.concat([
 		'L', cx + (rx * cos(end2)) + dx, cy + (ry * sin(end2)) + dy
 	]);
@@ -531,22 +548,42 @@ Highcharts.SVGRenderer.prototype.arc3dPath = function (shapeArgs) {
 		'L', cx + (irx * ce), cy + (iry * se),
 		'Z'
 	];
-
-	var a1 = sin((start + end) / 2),
-		a2 = sin(start),
-		a3 = sin(end);
-
+	
+	// correction for changed position of vanishing point caused by alpha and beta rotations
+	var angleCorr = Math.atan2(dy, -dx),
+		angleEnd = Math.abs(end + angleCorr), 
+		angleStart = Math.abs(start + angleCorr),
+		angleMid = Math.abs((start + end) / 2 + angleCorr);
+	
+	// set to 0-PI range
+	function toZeroPIRange(angle) {
+		angle = angle % (2 * PI);
+		if (angle > PI) {
+			angle = 2 * PI - angle; 
+		}
+		return angle;
+	}
+	angleEnd = toZeroPIRange(angleEnd);
+	angleStart = toZeroPIRange(angleStart);
+	angleMid = toZeroPIRange(angleMid);
+	
+	// *1e5 is to compensate pInt in zIndexSetter
+	var incPrecision = 1e5,
+		a1 = angleMid * incPrecision,
+		a2 = angleStart * incPrecision,
+		a3 = angleEnd * incPrecision;
+		
 	return {
 		top: top,
-		zTop: r,
+		zTop: PI * incPrecision + 1, // max angle is PI, so this is allways higher
 		out: out,
-		zOut: Math.max(a1, a2, a3) * r,
+		zOut: Math.max(a1, a2, a3),
 		inn: inn,
-		zInn: Math.max(a1, a2, a3) * r,
+		zInn: Math.max(a1, a2, a3),
 		side1: side1,
-		zSide1: a2 * (r * 0.99),
+		zSide1: a3 * 0.99, // to keep below zOut and zInn in case of same values
 		side2: side2,
-		zSide2: a3 * (r * 0.99)
+		zSide2: a2 * 0.99
 	};
 };
 /*** 
@@ -585,6 +622,10 @@ Highcharts.wrap(Highcharts.Chart.prototype, 'init', function (proceed) {
 		pieOptions;
 
 	if (args[0].chart.options3d && args[0].chart.options3d.enabled) {
+		// Normalize alpha and beta to (-360, 360) range
+		args[0].chart.options3d.alpha = (args[0].chart.options3d.alpha || 0) % 360;
+		args[0].chart.options3d.beta = (args[0].chart.options3d.beta || 0) % 360;
+
 		plotOptions = args[0].plotOptions || {};
 		pieOptions = plotOptions.pie || {};
 
@@ -642,13 +683,13 @@ Highcharts.Chart.prototype.retrieveStacks = function (stacking) {
 		stackNumber,
 		i = 1;
 
-	Highcharts.each(this.series, function (S) {
-		stackNumber = stacking ? (S.options.stack || 0) : series.length - 1 - S.index; // #3841
+	Highcharts.each(this.series, function (s) {
+		stackNumber = pick(s.options.stack, (stacking ? 0 : series.length - 1 - s.index)); // #3841, #4532
 		if (!stacks[stackNumber]) {
-			stacks[stackNumber] = { series: [S], position: i};
+			stacks[stackNumber] = { series: [s], position: i};
 			i++;
 		} else {
-			stacks[stackNumber].series.push(S);
+			stacks[stackNumber].series.push(s);
 		}
 	});
 
@@ -1424,38 +1465,40 @@ Highcharts.wrap(Highcharts.seriesTypes.scatter.prototype, 'translate', function
 
 	var series = this,
 		chart = series.chart,
-		zAxis = Highcharts.pick(series.zAxis, chart.options.zAxis[0]);
-
-	var raw_points = [],
-		raw_point,
-		projected_points,
-		projected_point,
+		zAxis = Highcharts.pick(series.zAxis, chart.options.zAxis[0]),
+		rawPoints = [],
+		rawPoint,
+		projectedPoints,
+		projectedPoint,
+		zValue,
 		i;
 
 	for (i = 0; i < series.data.length; i++) {
-		raw_point = series.data[i];
+		rawPoint = series.data[i];
+		zValue = zAxis.isLog && zAxis.val2lin ? zAxis.val2lin(rawPoint.z) : rawPoint.z; // #4562
+		rawPoint.plotZ = zAxis.translate(zValue);
 
-		raw_point.isInside = raw_point.isInside ? (raw_point.z >= zAxis.min && raw_point.z <= zAxis.max) : false;
+		rawPoint.isInside = rawPoint.isInside ? (zValue >= zAxis.min && zValue <= zAxis.max) : false;
 
-		raw_points.push({
-			x: raw_point.plotX,
-			y: raw_point.plotY,
-			z: zAxis.translate(raw_point.z)
+		rawPoints.push({
+			x: rawPoint.plotX,
+			y: rawPoint.plotY,
+			z: rawPoint.plotZ
 		});
 	}
 
-	projected_points = perspective(raw_points, chart, true);
+	projectedPoints = perspective(rawPoints, chart, true);
 
 	for (i = 0; i < series.data.length; i++) {
-		raw_point = series.data[i];
-		projected_point = projected_points[i];
+		rawPoint = series.data[i];
+		projectedPoint = projectedPoints[i];
 
-		raw_point.plotXold = raw_point.plotX;
-		raw_point.plotYold = raw_point.plotY;
+		rawPoint.plotXold = rawPoint.plotX;
+		rawPoint.plotYold = rawPoint.plotY;
 
-		raw_point.plotX = projected_point.x;
-		raw_point.plotY = projected_point.y;
-		raw_point.plotZ = projected_point.z;
+		rawPoint.plotX = projectedPoint.x;
+		rawPoint.plotY = projectedPoint.y;
+		rawPoint.plotZ = projectedPoint.z;
 
 
 	}

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

@@ -2,7 +2,7 @@
 // @compilation_level SIMPLE_OPTIMIZATIONS
 
 /**
- * @license Highcharts JS v4.1.8 (2015-08-20)
+ * @license Highcharts JS v4.1.9 (2015-10-07)
  *
  * (c) 2009-2014 Torstein Honsi
  *
@@ -78,7 +78,9 @@ extend(Pane.prototype, {
 				config.color = config.backgroundColor; // due to naming in plotBands
 				firstAxis.options.plotBands.unshift(config);
 				axisUserOptions.plotBands = axisUserOptions.plotBands || []; // #3176
-				axisUserOptions.plotBands.unshift(config);
+				if (axisUserOptions.plotBands !== firstAxis.options.plotBands) {
+					axisUserOptions.plotBands.unshift(config);
+				}
 			});
 		}
 	},
@@ -829,6 +831,7 @@ seriesTypes.arearange = extendClass(seriesTypes.area, {
 			seriesProto = Series.prototype,
 			dataLabelOptions = this.options.dataLabels,
 			align = dataLabelOptions.align,
+			inside = dataLabelOptions.inside,
 			point,
 			up,
 			inverted = this.chart.inverted;
@@ -840,7 +843,7 @@ seriesTypes.arearange = extendClass(seriesTypes.area, {
 			while (i--) {
 				point = data[i];
 				if (point) {
-					up = point.plotHigh > point.plotLow;
+					up = inside ? point.plotHigh < point.plotLow : point.plotHigh > point.plotLow;
 					
 					// Set preliminary values
 					point.y = point.high;
@@ -874,7 +877,7 @@ seriesTypes.arearange = extendClass(seriesTypes.area, {
 			while (i--) {
 				point = data[i];
 				if (point) {
-					up = point.plotHigh > point.plotLow;
+					up = inside ? point.plotHigh < point.plotLow : point.plotHigh > point.plotLow;
 					
 					// Move the generated labels from step 1, and reassign the original data labels
 					point.dataLabelUpper = point.dataLabel;
@@ -990,6 +993,7 @@ seriesTypes.areasplinerange = extendClass(seriesTypes.arearange, {
 		directTouch: true,
 		trackerGroups: ['group', 'dataLabelsGroup'],
 		drawGraph: noop,
+		crispCol: colProto.crispCol,
 		pointAttrToOptions: colProto.pointAttrToOptions,
 		drawPoints: colProto.drawPoints,
 		drawTracker: colProto.drawTracker,
@@ -1347,7 +1351,8 @@ seriesTypes.boxplot = extendClass(seriesTypes.column, {
 			shapeArgs,
 			color,
 			doQuartiles = series.doQuartiles !== false, // error bar inherits this series type but doesn't do quartiles
-			whiskerLength = parseInt(series.options.whiskerLength, 10) / 100;
+			pointWiskerLength,
+			whiskerLength = series.options.whiskerLength;
 
 
 		each(points, function (point) {
@@ -1432,21 +1437,22 @@ seriesTypes.boxplot = extendClass(seriesTypes.column, {
 					crispCorr = (whiskersAttr['stroke-width'] % 2) / 2;
 					highPlot = highPlot + crispCorr;
 					lowPlot = lowPlot + crispCorr;
+					pointWiskerLength = (/%$/).test(whiskerLength) ? halfWidth * parseFloat(whiskerLength) / 100 : whiskerLength / 2;
 					whiskersPath = [
 						// High whisker
 						'M',
-						crispX - halfWidth * whiskerLength, 
+						crispX - pointWiskerLength, 
 						highPlot,
 						'L',
-						crispX + halfWidth * whiskerLength, 
+						crispX + pointWiskerLength, 
 						highPlot,
 						
 						// Low whisker
 						'M',
-						crispX - halfWidth * whiskerLength, 
+						crispX - pointWiskerLength, 
 						lowPlot,
 						'L',
-						crispX + halfWidth * whiskerLength, 
+						crispX + pointWiskerLength, 
 						lowPlot
 					];
 				}
@@ -1853,6 +1859,7 @@ defaultPlotOptions.bubble = merge(defaultPlotOptions.scatter, {
 	maxSize: '20%',
 	// negativeColor: null,
 	// sizeBy: 'area'
+	softThreshold: false,
 	states: {
 		hover: {
 			halo: {
@@ -1932,24 +1939,41 @@ seriesTypes.bubble = extendClass(seriesTypes.scatter, {
 			pos,
 			zData = this.zData,
 			radii = [],
-			sizeByArea = this.options.sizeBy !== 'width',
-			zRange = zMax - zMin;
+			options = this.options,
+			sizeByArea = options.sizeBy !== 'width',
+			zThreshold = options.zThreshold,
+			zRange = zMax - zMin,
+			value,
+			radius;
 
 		// Set the shape type and arguments to be picked up in drawPoints
 		for (i = 0, len = zData.length; i < len; i++) {
+
+			value = zData[i];
+
+			// When sizing by threshold, the absolute value of z determines the size
+			// of the bubble.
+			if (options.sizeByAbsoluteValue) {
+				value = Math.abs(value - zThreshold);
+				zMax = Math.max(zMax - zThreshold, Math.abs(zMin - zThreshold));
+				zMin = 0;
+			}
+
+			if (value === null) {
+				radius = null;
 			// Issue #4419 - if value is less than zMin, push a radius that's always smaller than the minimum size
-			if (zData[i] < zMin) {
-				radii.push(minSize / 2 - 1);
+			} else if (value < zMin) {
+				radius = minSize / 2 - 1;
 			} else {
 				// Relative size, a number between 0 and 1
-				pos = zRange > 0 ? (zData[i] - zMin) / zRange : 0.5; 
-				
+				pos = zRange > 0 ? (value - zMin) / zRange : 0.5; 
+
 				if (sizeByArea && pos >= 0) {
 					pos = Math.sqrt(pos);
 				}
-		
-				radii.push(math.ceil(minSize + pos * (maxSize - minSize)) / 2);
+				radius = math.ceil(minSize + pos * (maxSize - minSize)) / 2;
 			}
+			radii.push(radius);
 		}
 		this.radii = radii;
 	},
@@ -2002,7 +2026,7 @@ seriesTypes.bubble = extendClass(seriesTypes.scatter, {
 			point = data[i];
 			radius = radii ? radii[i] : 0; // #1737
 			
-			if (radius >= this.minPxSize / 2) {
+			if (typeof radius === 'number' && radius >= this.minPxSize / 2) {
 				// Shape arguments
 				point.shapeType = 'circle';
 				point.shapeArgs = {
@@ -2018,7 +2042,7 @@ seriesTypes.bubble = extendClass(seriesTypes.scatter, {
 					width: 2 * radius,
 					height: 2 * radius
 				};
-			} else { // below zThreshold
+			} else { // below zThreshold or z = null
 				point.shapeArgs = point.plotY = point.dlBox = UNDEFINED; // #1691
 			}
 		}

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

@@ -145,8 +145,8 @@
         hasExtremes: function (checkX) {
             var options = this.options,
                 data = options.data,
-                xAxis = this.xAxis.options,
-                yAxis = this.yAxis.options;
+                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'));
         },
@@ -538,8 +538,8 @@
     /**
      * Return a point instance from the k-d-tree
      */
-    wrap(Series.prototype, 'searchPoint', function (proceed, e) {
-        var point = proceed.call(this, e),
+    wrap(Series.prototype, 'searchPoint', function (proceed) {
+        var point = proceed.apply(this, [].slice.call(arguments, 1)),
             ret = point;
 
         if (point && !(point instanceof this.pointClass)) {

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

@@ -1,5 +1,5 @@
 /**
- * Highcharts JS v4.1.8 (2015-08-20)
+ * Highcharts JS v4.1.9 (2015-10-07)
  * Highcharts Broken Axis module
  * 
  * Author: Stephane Vanraes, Torstein Honsi
@@ -78,10 +78,6 @@
 				newPositions = [],
 				i;
 
-			if (info && info.totalRange >= axis.closestPointRange) { 
-				return;
-			}
-
 			for (i = 0; i < tickPositions.length; i++) {
 				if (!axis.isInAnyBreak(tickPositions[i])) {
 					newPositions.push(tickPositions[i]);

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

@@ -2908,7 +2908,7 @@ if (CanvasRenderingContext2D) {
 		});
 	}
 }/**
- * @license Highcharts JS v4.1.8 (2015-08-20)
+ * @license Highcharts JS v4.1.9 (2015-10-07)
  * CanVGRenderer Extension module
  *
  * (c) 2011-2012 Torstein Honsi, Erik Olsson