highcharts-rails 4.1.4 → 4.1.5

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

@@ -1,5 +1,5 @@
 /**
- * @license Highcharts JS v4.1.4 (2015-03-10)
+ * @license Highcharts JS v4.1.5 (2015-04-13)
  * Exporting module
  *
  * (c) 2010-2014 Torstein Honsi
@@ -223,7 +223,7 @@ extend(Chart.prototype, {
 			.replace(/height=([^" ]+)/g, 'height="$1"')
 			.replace(/width=([^" ]+)/g, 'width="$1"')
 			.replace(/hc-svg-href="([^"]+)">/g, 'xlink:href="$1"/>')
-			.replace(/id=([^" >]+)/g, 'id="$1"')
+			.replace(/ id=([^" >]+)/g, 'id="$1"') // #4003
 			.replace(/class=([^" >]+)/g, 'class="$1"')
 			.replace(/ transform /g, ' ')
 			.replace(/:(path|rect)/g, '$1')

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

@@ -1,5 +1,5 @@
 /**
- * @license Highcharts JS v4.1.4 (2015-03-10)
+ * @license Highcharts JS v4.1.5 (2015-04-13)
  *
  * (c) 2011-2014 Torstein Honsi
  *
@@ -98,7 +98,7 @@ extend(ColorAxis.prototype, {
 	 * Return an intermediate color between two colors, according to pos where 0
 	 * is the from color and 1 is the to color. 
 	 * NOTE: Changes here should be copied
-	 * to the same function in drilldown.src.js.
+	 * to the same function in drilldown.src.js and solid-gauge-src.js.
 	 */
 	tweenColors: function (from, to, pos) {
 		// Check for has alpha, because rgba colors perform worse due to lack of
@@ -108,8 +108,7 @@ extend(ColorAxis.prototype, {
 
 		// 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 {
@@ -375,7 +374,7 @@ extend(ColorAxis.prototype, {
 		}
 	},
 	getPlotLinePath: function (a, b, c, d, pos) {
-		if (pos) { // crosshairs only
+		if (typeof pos === 'number') { // crosshairs only // #3969 pos can be 0 !!
 			return 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'];
@@ -568,6 +567,7 @@ defaultOptions.plotOptions.heatmap = merge(defaultOptions.plotOptions.scatter, {
 		padding: 0 // #3837
 	},
 	marker: null,
+	pointRange: null, // dynamically set to colsize by default
 	tooltip: {
 		pointFormat: '{point.x}, {point.y}: {point.value}<br/>'
 	},
@@ -589,10 +589,17 @@ seriesTypes.heatmap = extendClass(seriesTypes.scatter, merge(colorSeriesMixin, {
 	hasPointSpecificOptions: true,
 	supportsDrilldown: true,
 	getExtremesFromAll: true,
+
+	/**
+	 * Override the init method to add point ranges on both axes.
+	 */
 	init: function () {
+		var options;
 		seriesTypes.scatter.prototype.init.apply(this, arguments);
-		this.pointRange = this.options.colsize || 1;
-		this.yAxis.axisPointRange = this.options.rowsize || 1; // general point range
+
+		options = this.options;
+		this.pointRange = options.pointRange = pick(options.pointRange, options.colsize || 1); // #3758, prevent resetting in setData
+		this.yAxis.axisPointRange = options.rowsize || 1; // general point range
 	},
 	translate: function () {
 		var series = this,
@@ -611,7 +618,7 @@ seriesTypes.heatmap = extendClass(seriesTypes.scatter, merge(colorSeriesMixin, {
 				y2 = Math.round(yAxis.translate(point.y + yPad, 0, 1, 0, 1));
 
 			// Set plotX and plotY for use in K-D-Tree and more
-			point.plotX = (x1 + x2) / 2;
+			point.plotX = point.clientX = (x1 + x2) / 2;
 			point.plotY = (y1 + y2) / 2;
 
 			point.shapeType = 'rect';

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

@@ -1,5 +1,5 @@
 /**
- * @license Highcharts JS v4.1.4 (2015-03-10)
+ * @license Highcharts JS v4.1.5 (2015-04-13)
  * Plugin for displaying a message when there is no data visible in chart.
  *
  * (c) 2010-2014 Highsoft AS

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

@@ -1,5 +1,5 @@
 /**
- * @license  Highcharts JS v4.1.4 (2015-03-10)
+ * @license  Highcharts JS v4.1.5 (2015-04-13)
  * Solid angular gauge module
  *
  * (c) 2010-2014 Torstein Honsi
@@ -120,19 +120,32 @@
 			}
 			return color;
 		},
+		/*
+		 * Return an intermediate color between two colors, according to pos where 0
+		 * is the from color and 1 is the to color.
+		 */
 		tweenColors: function (from, to, pos) {
 			// Check for has alpha, because rgba colors perform worse due to lack of
 			// support in WebKit.
-			var hasAlpha = (to.rgba[3] !== 1 || from.rgba[3] !== 1);
+			var hasAlpha,
+				ret;
+
+			// Unsupported color, return to-color (#3920)
+			if (!to.rgba.length || !from.rgba.length) {
+				ret = to.raw || 'none';
 
-			if (from.rgba.length === 0 || to.rgba.length === 0) {
-				return 'none';
+			// Interpolate
+			} else {
+				from = from.rgba;
+				to = to.rgba;
+				hasAlpha = (to[3] !== 1 || from[3] !== 1);
+				ret = (hasAlpha ? 'rgba(' : 'rgb(') + 
+					Math.round(to[0] + (from[0] - to[0]) * (1 - pos)) + ',' + 
+					Math.round(to[1] + (from[1] - to[1]) * (1 - pos)) + ',' + 
+					Math.round(to[2] + (from[2] - to[2]) * (1 - pos)) + 
+					(hasAlpha ? (',' + (to[3] + (from[3] - to[3]) * (1 - pos))) : '') + ')';
 			}
-			return (hasAlpha ? 'rgba(' : 'rgb(') + 
-				Math.round(to.rgba[0] + (from.rgba[0] - to.rgba[0]) * (1 - pos)) + ',' + 
-				Math.round(to.rgba[1] + (from.rgba[1] - to.rgba[1]) * (1 - pos)) + ',' + 
-				Math.round(to.rgba[2] + (from.rgba[2] - to.rgba[2]) * (1 - pos)) + 
-				(hasAlpha ? (',' + (to.rgba[3] + (from.rgba[3] - to.rgba[3]) * (1 - pos))) : '') + ')';
+			return ret;
 		}
 	};
 
@@ -171,7 +184,6 @@
 				yAxis = series.yAxis,
 				center = yAxis.center,
 				options = series.options,
-				radius = series.radius = (pInt(pick(options.radius, 100)) * center[2]) / 200,
 				renderer = series.chart.renderer,
 				overshoot = options.overshoot,
 				overshootVal = overshoot && typeof overshoot === 'number' ? overshoot / 180 * Math.PI : 0;
@@ -179,7 +191,8 @@
 			H.each(series.points, function (point) {
 				var graphic = point.graphic,
 					rotation = yAxis.startAngleRad + yAxis.translate(point.y, null, null, null, true),
-					innerRadius = (pInt(pick(options.innerRadius, 60)) * center[2]) / 200,
+					radius = (pInt(pick(point.options.radius, options.radius, 100)) * center[2]) / 200, // docs: series<solidgauge>.data.radius http://jsfiddle.net/highcharts/7nwebu4b/
+					innerRadius = (pInt(pick(point.options.innerRadius, options.innerRadius, 60)) * center[2]) / 200, // docs: series<solidgauge>.data.innerRadius
 					shapeArgs,
 					d,
 					toColor = yAxis.toColor(point.y, point),
@@ -220,6 +233,7 @@
 					end: maxAngle,
 					fill: toColor
 				};
+				point.startR = radius; // For PieSeries.animate
 
 				if (graphic) {
 					d = shapeArgs.d;
@@ -243,11 +257,10 @@
 		 */
 		animate: function (init) {
 
-			this.center = this.yAxis.center;
-			this.center[3] = 2 * this.radius;
-			this.startAngleRad = this.yAxis.startAngleRad;
-
-			H.seriesTypes.pie.prototype.animate.call(this, init);
+			if (!init) {
+				this.startAngleRad = this.yAxis.startAngleRad;
+				H.seriesTypes.pie.prototype.animate.call(this, init);
+			}
 		}
 	});
 

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

@@ -1,5 +1,5 @@
 /**
- * @license Highcharts JS v4.1.4 (2015-03-10)
+ * @license Highcharts JS v4.1.5 (2015-04-13)
  *
  * (c) 2014 Highsoft AS
  * Authors: Jon Arild Nygard / Oystein Moseng
@@ -773,6 +773,7 @@
 			this.rootNode = id;
 			this.xAxis.setExtremes(val.x, val.x + val.width, false);
 			this.yAxis.setExtremes(val.y, val.y + val.height, false);
+			this.isDirty = true; // Force redraw
 			this.chart.redraw();
 		},
 		showDrillUpButton: function (name) {
@@ -824,6 +825,7 @@
 			// Get the extremes from the y data
 			Series.prototype.getExtremes.call(this);
 		},
+		getExtremesFromAll: true,
 		bindAxes: function () {
 			var treeAxis = {
 				endOnTick: false,

data/lib/highcharts/version.rb

@@ -1,3 +1,3 @@
 module Highcharts
-  VERSION = "4.1.4"
+  VERSION = "4.1.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: highcharts-rails
 version: !ruby/object:Gem::Version
-  version: 4.1.4
+  version: 4.1.5
 platform: ruby
 authors:
 - Per Christian B. Viken
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-20 00:00:00.000000000 Z
+date: 2015-04-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties