highcharts-rails 4.2.3 → 4.2.4

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

@@ -1,5 +1,5 @@
 /**
- * Highcharts JS v4.2.3 (2016-02-08)
+ * Highcharts JS v4.2.4 (2016-04-14)
  * Highcharts Broken Axis module
  * 
  * License: www.highcharts.com/license
@@ -289,21 +289,19 @@
 
 	function drawPointsWrapped(proceed) {
 		proceed.apply(this);
-		this.drawBreaks();
+		this.drawBreaks(this.xAxis, ['x']);
+		this.drawBreaks(this.yAxis, pick(this.pointArrayMap, ['y']));
 	}
 
-	H.Series.prototype.drawBreaks = function () {
+	H.Series.prototype.drawBreaks = function (axis, keys) {
 		var series = this,
 			points = series.points,
-			axis,
 			breaks,
 			threshold,
-			axisName = 'Axis',
 			eventName,
 			y;
 
-		each(['y', 'x'], function (key) {
-			axis = series[key + axisName];
+		each(keys, function (key) {
 			breaks = axis.breakArray || [];
 			threshold = axis.isXAxis ? axis.min : pick(series.options.threshold, axis.min);
 			each(points, function (point) {

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

@@ -2908,7 +2908,7 @@ if (CanvasRenderingContext2D) {
 		});
 	}
 }/**
- * @license Highcharts JS v4.2.3 (2016-02-08)
+ * @license Highcharts JS v4.2.4 (2016-04-14)
  * 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.3 (2016-02-08)
+ * @license Highcharts JS v4.2.4 (2016-04-14)
  * Data module
  *
  * (c) 2012-2016 Torstein Honsi

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

@@ -350,6 +350,9 @@
 			}
 		}
 
+		// Fire a once-off event after all series have been drilled up (#5158)
+		fireEvent(chart, 'drillupall');
+
 		this.redraw();
 
 		if (this.drilldownLevels.length === 0) {
@@ -526,7 +529,7 @@
 		});
 	}
 	
-	H.Point.prototype.doDrilldown = function (_holdRedraw, category) {
+	H.Point.prototype.doDrilldown = function (_holdRedraw, category, originalEvent) {
 		var series = this.series,
 			chart = series.chart,
 			drilldown = chart.options.drilldown,
@@ -550,29 +553,34 @@
 			point: this,
 			seriesOptions: seriesOptions,
 			category: category,
+			originalEvent: originalEvent,
 			points: category !== undefined && this.series.xAxis.ddPoints[category].slice(0)
+		}, function (e) {
+			var chart = e.point.series && e.point.series.chart,
+				seriesOptions = e.seriesOptions;
+			if (chart && seriesOptions) {
+				if (_holdRedraw) {
+					chart.addSingleSeriesAsDrilldown(e.point, seriesOptions);
+				} else {
+					chart.addSeriesAsDrilldown(e.point, seriesOptions);
+				}
+			}
 		});
 		
-		if (seriesOptions) {
-			if (_holdRedraw) {
-				chart.addSingleSeriesAsDrilldown(this, seriesOptions);
-			} else {
-				chart.addSeriesAsDrilldown(this, seriesOptions);
-			}
-		}
+
 	};
 
 	/**
 	 * Drill down to a given category. This is the same as clicking on an axis label.
 	 */
-	H.Axis.prototype.drilldownCategory = function (x) {
+	H.Axis.prototype.drilldownCategory = function (x, e) {
 		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);
+				point.doDrilldown(true, x, e);
 			}
 		}
 		this.chart.applyDrilldown();
@@ -612,8 +620,8 @@
 			label
 				.addClass('highcharts-drilldown-axis-label')
 				.css(axis.chart.options.drilldown.activeAxisLabelStyle)
-				.on('click', function () {
-					axis.drilldownCategory(pos);
+				.on('click', function (e) {
+					axis.drilldownCategory(pos, e);
 				});
 
 		} else if (label && label.basicStyles) {
@@ -645,11 +653,11 @@
 		if (point.drilldown) {
 			
 			// Add the click event to the point 
-			H.addEvent(point, 'click', function () {
+			H.addEvent(point, 'click', function (e) {
 				if (series.xAxis && series.chart.options.drilldown.allowPointDrilldown === false) {
-					series.xAxis.drilldownCategory(x);
+					series.xAxis.drilldownCategory(x, e);
 				} else {
-					point.doDrilldown();
+					point.doDrilldown(undefined, undefined, e);
 				}
 			});
 			/*wrap(point, 'importEvents', function (proceed) { // wrapping importEvents makes point.click event work

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

@@ -1,5 +1,5 @@
 /**
- * @license Highcharts JS v4.2.3 (2016-02-08)
+ * @license Highcharts JS v4.2.4 (2016-04-14)
  * Exporting module
  *
  * (c) 2010-2016 Torstein Honsi

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

@@ -23,8 +23,7 @@ var defaultOptions = Highcharts.getOptions(),
 	seriesTypes = Highcharts.seriesTypes,
 	merge = Highcharts.merge,
 	noop = function () {},
-	each = Highcharts.each,
-	pick = Highcharts.pick;
+	each = Highcharts.each;
 
 // set default options
 defaultPlotOptions.funnel = merge(defaultPlotOptions.pie, {
@@ -229,24 +228,17 @@ seriesTypes.funnel = Highcharts.extendClass(seriesTypes.pie, {
 	 */
 	drawPoints: function () {
 		var series = this,
-			options = series.options,
 			chart = series.chart,
 			renderer = chart.renderer,
-			pointOptions,
 			pointAttr,
 			shapeArgs,
 			graphic;
 
 		each(series.data, function (point) {
-			pointOptions = point.options;
 			graphic = point.graphic;
 			shapeArgs = point.shapeArgs;
 
-			pointAttr = {
-				fill: point.color,
-				stroke: pick(pointOptions.borderColor, options.borderColor),
-				'stroke-width': pick(pointOptions.borderWidth, options.borderWidth)
-			};
+			pointAttr = point.pointAttr[point.selected ? 'select' : ''];
 
 			if (!graphic) { // Create the shapes				
 				point.graphic = renderer.path(shapeArgs)

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

@@ -1,5 +1,5 @@
 /**
- * @license Highcharts JS v4.2.3 (2016-02-08)
+ * @license Highcharts JS v4.2.4 (2016-04-14)
  *
  * (c) 2011-2016 Torstein Honsi
  *

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

@@ -1,5 +1,5 @@
 /**
- * @license Highcharts JS v4.2.3 (2016-02-08)
+ * @license Highcharts JS v4.2.4 (2016-04-14)
  * Plugin for displaying a message when there is no data visible in chart.
  *
  * (c) 2010-2016 Highsoft AS
@@ -52,7 +52,7 @@
 		return !!this.points.length; /* != 0 */
 	}
 
-	each(['pie', 'gauge', 'waterfall', 'bubble'], function (type) {
+	each(['pie', 'gauge', 'waterfall', 'bubble', 'treemap'], function (type) {
 		if (seriesTypes[type]) {
 			seriesTypes[type].prototype.hasData = hasDataPie;
 		}

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

@@ -1,5 +1,5 @@
 /**
- * @license Highcharts JS v4.2.3 (2016-02-08)
+ * @license Highcharts JS v4.2.4 (2016-04-14)
  * Client side exporting module
  *
  * (c) 2015 Torstein Honsi / Oystein Moseng

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

@@ -1,5 +1,5 @@
 /**
- * @license  Highcharts JS v4.2.3 (2016-02-08)
+ * @license  Highcharts JS v4.2.4 (2016-04-14)
  * Solid angular gauge module
  *
  * (c) 2010-2016 Torstein Honsi

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

@@ -1,5 +1,5 @@
 /**
- * @license Highcharts JS v4.2.3 (2016-02-08)
+ * @license Highcharts JS v4.2.4 (2016-04-14)
  *
  * (c) 2014 Highsoft AS
  * Authors: Jon Arild Nygard / Oystein Moseng
@@ -47,6 +47,7 @@
 			return previous;
 		},
 		// @todo find correct name for this function. 
+		// @todo Similar to reduce, this function is likely redundant
 		recursive = function (item, func, context) {
 			var next;
 			context = context || this;
@@ -79,10 +80,12 @@
 		layoutStartingDirection: 'vertical',
 		alternateStartingDirection: false,
 		levelIsConstant: true,
+		opacity: 0.15,
 		states: {
 			hover: {
 				borderColor: '#A0A0A0',
 				brightness: seriesTypes.heatmap ? 0 : 0.1,
+				opacity: 0.75,
 				shadow: false
 			}
 		},
@@ -156,6 +159,7 @@
 
 			series.nodeMap = [];
 			tree = series.buildNode('', -1, 0, parentList, null);
+			// Parents of the root node is by default visible
 			recursive(this.nodeMap[this.rootNode], function (node) {
 				var next = false,
 					p = node.parent;
@@ -165,6 +169,7 @@
 				}
 				return next;
 			});
+			// Children of the root node is by default visible
 			recursive(this.nodeMap[this.rootNode].children, function (children) {
 				var next = false;
 				each(children, function (child) {
@@ -314,7 +319,7 @@
 					y1,
 					y2;
 				// Points which is ignored, have no values.
-				if (values) {
+				if (values && node.visible) {
 					x1 = Math.round(xAxis.translate(values.x, 0, 0, 0, 1));
 					x2 = Math.round(xAxis.translate(values.x + values.width, 0, 0, 0, 1));
 					y1 = Math.round(yAxis.translate(values.y, 0, 0, 0, 1));
@@ -587,11 +592,13 @@
 			}
 
 			// Update axis extremes according to the root node.
-			val = this.nodeMap[this.rootNode].pointValues;
-			this.xAxis.setExtremes(val.x, val.x + val.width, false);
-			this.yAxis.setExtremes(val.y, val.y + val.height, false);
-			this.xAxis.setScale();
-			this.yAxis.setScale();
+			if (this.options.allowDrillToNode) {
+				val = this.nodeMap[this.rootNode].pointValues;
+				this.xAxis.setExtremes(val.x, val.x + val.width, false);
+				this.yAxis.setExtremes(val.y, val.y + val.height, false);
+				this.xAxis.setScale();
+				this.yAxis.setScale();
+			}
 
 			// Assign values to points.
 			this.setPointValues();
@@ -628,6 +635,9 @@
 				// Set dataLabel width to the width of the point shape.
 				if (point.shapeArgs) {
 					options.style.width = point.shapeArgs.width;
+					if (point.dataLabel) {
+						point.dataLabel.css({ width: point.shapeArgs.width + 'px' });
+					}
 				}
 
 				// Merge custom options with point options
@@ -644,7 +654,8 @@
 			var level = this.levelMap[point.node.levelDynamic] || {},
 				options = this.options,
 				attr,
-				stateOptions = (state && options.states[state]) || {};
+				stateOptions = (state && options.states[state]) || {},
+				opacity;
 
 			// Set attributes by precedence. Point trumps level trumps series. Stroke width uses pick
 			// because it can be 0.
@@ -661,14 +672,17 @@
 				attr.fill = 'none';
 				attr['stroke-width'] = 0;
 			} else if (!point.node.isLeaf) {
-				// If not a leaf, then remove fill
-				// @todo let users set the opacity
-				attr.fill = pick(options.interactByLeaf, !options.allowDrillToNode) ? 'none' : Color(attr.fill).setOpacity(state === 'hover' ? 0.75 : 0.15).get();
+				// If not a leaf, either set opacity or remove fill
+				if (pick(options.interactByLeaf, !options.allowDrillToNode)) {
+					attr.fill = 'none';
+				} else {
+					opacity = pick(stateOptions.opacity, options.opacity);
+					attr.fill = Color(attr.fill).setOpacity(opacity).get();
+				}
 			} else if (state) {
 				// Brighten and hoist the hover nodes
 				attr.fill = Color(attr.fill).brighten(stateOptions.brightness).get();
 			}
-
 			return attr;
 		},
 

data/lib/highcharts/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: highcharts-rails
 version: !ruby/object:Gem::Version
-  version: 4.2.3
+  version: 4.2.4
 platform: ruby
 authors:
 - Per Christian B. Viken
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-09 00:00:00.000000000 Z
+date: 2016-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties