highcharts-rails 4.0.3 → 4.0.4

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

@@ -24,7 +24,8 @@
 		PieSeries = seriesTypes.pie,
 		ColumnSeries = seriesTypes.column,
 		fireEvent = HighchartsAdapter.fireEvent,
-		inArray = HighchartsAdapter.inArray;
+		inArray = HighchartsAdapter.inArray,
+		dupes = [];
 
 	// Utilities
 	function tweenColors(startColor, endColor, pos) {
@@ -112,10 +113,10 @@
 			if (series.xAxis === xAxis) {
 				levelSeries.push(series);
 				levelSeriesOptions.push(series.userOptions);
-				series.levelNumber = series.levelNumber || 0;
+				series.levelNumber = series.levelNumber || levelNumber; // #3182
 			}
 		});
-		
+
 		// Add a record of properties for each drilldown level
 		level = {
 			levelNumber: levelNumber,
@@ -159,26 +160,33 @@
 
 	Chart.prototype.applyDrilldown = function () {
 		var drilldownLevels = this.drilldownLevels, 
-			levelToRemove = drilldownLevels[drilldownLevels.length - 1].levelNumber;
+			levelToRemove;
 		
-		each(this.drilldownLevels, function (level) {
-			if (level.levelNumber === levelToRemove) {
-				each(level.levelSeries, function (series) {
-					if (series.levelNumber === levelToRemove) { // Not removed, not added as part of a multi-series drilldown
-						series.remove(false);
-					}
-				});
-			}
-		});
+		if (drilldownLevels && drilldownLevels.length > 0) { // #3352, async loading
+			levelToRemove = drilldownLevels[drilldownLevels.length - 1].levelNumber;
+			each(this.drilldownLevels, function (level) {
+				if (level.levelNumber === levelToRemove) {
+					each(level.levelSeries, function (series) {
+						if (series.levelNumber === levelToRemove) { // Not removed, not added as part of a multi-series drilldown
+							series.remove(false);
+						}
+					});
+				}
+			});
+		}
 		
 		this.redraw();
 		this.showDrillUpButton();
 	};
 
 	Chart.prototype.getDrilldownBackText = function () {
-		var lastLevel = this.drilldownLevels[this.drilldownLevels.length - 1];
-		lastLevel.series = lastLevel.seriesOptions;
-		return format(this.options.lang.drillUpText, lastLevel);
+		var drilldownLevels = this.drilldownLevels,
+			lastLevel;
+		if (drilldownLevels && drilldownLevels.length > 0) { // #3352, async loading
+			lastLevel = drilldownLevels[drilldownLevels.length - 1];
+			lastLevel.series = lastLevel.seriesOptions;
+			return format(this.options.lang.drillUpText, lastLevel);
+		}
 
 	};
 
@@ -300,6 +308,8 @@
 			})
 			.align();
 		}
+
+		dupes.length = []; // #3315
 	};
 
 
@@ -480,8 +490,9 @@
 			seriesOptions;
 		
 		while (i-- && !seriesOptions) {
-			if (drilldown.series[i].id === this.drilldown) {
+			if (drilldown.series[i].id === this.drilldown && inArray(this.drilldown, dupes) === -1) {
 				seriesOptions = drilldown.series[i];
+				dupes.push(this.drilldown);
 			}
 		}
 
@@ -510,15 +521,23 @@
 		
 		if (point.drilldown) {
 			
-			// Add the click event to the point label
+			// Add the click event to the point 
 			H.addEvent(point, 'click', function () {
 				point.doDrilldown();
 			});
-			
+			/*wrap(point, 'importEvents', function (proceed) { // wrapping importEvents makes point.click event work
+				if (!this.hasImportedEvents) {
+					proceed.call(this);
+					H.addEvent(this, 'click', function () {
+						this.doDrilldown();
+					});
+				}
+			});*/
+
 			// Make axis labels clickable
 			if (tickLabel) {
-				if (!tickLabel._basicStyle) {
-					tickLabel._basicStyle = tickLabel.element.getAttribute('style');
+				if (!tickLabel.basicStyles) {
+					tickLabel.basicStyles = H.merge(tickLabel.styles);
 				}
 				tickLabel
 					.addClass('highcharts-drilldown-axis-label')
@@ -537,8 +556,9 @@
 				tickLabel.ddPoints.push(point);
 					
 			}
-		} else if (tickLabel && tickLabel._basicStyle) {
-			tickLabel.element.setAttribute('style', tickLabel._basicStyle);
+		} else if (tickLabel && tickLabel.basicStyles) {
+			tickLabel.styles = {}; // reset for full overwrite of styles
+			tickLabel.css(tickLabel.basicStyles);
 		}
 		
 		return point;

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

@@ -1,5 +1,5 @@
 /**
- * @license Highcharts JS v4.0.3 (2014-07-03)
+ * @license Highcharts JS v4.0.4 (2014-09-02)
  * Exporting module
  *
  * (c) 2010-2014 Torstein Honsi

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

@@ -74,7 +74,7 @@ seriesTypes.funnel = Highcharts.extendClass(seriesTypes.pie, {
 			cumulative = 0, // start at top
 			center = options.center,
 			centerX = getLength(center[0], plotWidth),
-			centerY = getLength(center[0], plotHeight),
+			centerY = getLength(center[1], plotHeight),
 			width = getLength(options.width, plotWidth),
 			tempWidth,
 			getWidthAt,

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

@@ -1,5 +1,5 @@
 /**
- * @license Highcharts JS v4.0.3 (2014-07-03)
+ * @license Highcharts JS v4.0.4 (2014-09-02)
  *
  * (c) 2011-2014 Torstein Honsi
  *
@@ -109,14 +109,15 @@ extend(ColorAxis.prototype, {
 			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))) : '') + ')';
-		},
+	},
 
 	initDataClasses: function (userOptions) {
 		var axis = this,
 			chart = this.chart,
 			dataClasses,
 			colorCounter = 0,
-			options = this.options;
+			options = this.options,
+			len = userOptions.dataClasses.length;
 		this.dataClasses = dataClasses = [];
 		this.legendItems = [];
 
@@ -134,7 +135,11 @@ extend(ColorAxis.prototype, {
 						colorCounter = 0;
 					}
 				} else {
-					dataClass.color = axis.tweenColors(Color(options.minColor), Color(options.maxColor), i / (userOptions.dataClasses.length - 1));
+					dataClass.color = axis.tweenColors(
+						Color(options.minColor), 
+						Color(options.maxColor), 
+						len < 2 ? 0.5 : i / (len - 1) // #3219
+					);
 				}
 			}
 		});
@@ -436,7 +441,14 @@ extend(ColorAxis.prototype, {
 	name: '' // Prevents 'undefined' in legend in IE8
 });
 
-
+/**
+ * Handle animation of the color attributes directly
+ */
+each(['fill', 'stroke'], function (prop) {
+	HighchartsAdapter.addAnimSetter(prop, function (fx) {
+		fx.elem.attr(prop, ColorAxis.prototype.tweenColors(Color(fx.start), Color(fx.end), fx.pos));
+	});
+});
 
 /**
  * Extend the chart getAxes method to also get the color axis
@@ -650,7 +662,7 @@ seriesTypes.heatmap = extendClass(seriesTypes.scatter, merge(colorSeriesMixin, {
 		// Make sure colors are updated on colorAxis update (#2893)
 		if (this.chart.hasRendered) {
 			each(series.points, function (point) {
-				point.shapeArgs.fill = point.color;
+				point.shapeArgs.fill = point.options.color || point.color; // #3311
 			});
 		}
 	},

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

@@ -1,5 +1,5 @@
 /**
- * @license Highcharts JS v4.0.3 (2014-07-03)
+ * @license Highcharts JS v4.0.4 (2014-09-02)
  * Plugin for displaying a message when there is no data visible in chart.
  *
  * (c) 2010-2014 Highsoft AS
@@ -8,7 +8,7 @@
  * License: www.highcharts.com/license
  */
 
-(function (H) { // docs
+(function (H) {
 	
 	var seriesTypes = H.seriesTypes,
 		chartPrototype = H.Chart.prototype,

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

@@ -1,5 +1,5 @@
 /**
- * @license  Highcharts JS v4.0.3 (2014-07-03)
+ * @license  Highcharts JS v4.0.4 (2014-09-02)
  * Solid angular gauge module
  *
  * (c) 2010-2014 Torstein Honsi

data/lib/highcharts/version.rb

@@ -1,3 +1,3 @@
 module Highcharts
-  VERSION = "4.0.3"
+  VERSION = "4.0.4"
 end

metadata

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