highcharts-rails 4.2.0 → 4.2.2

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

@@ -1,5 +1,5 @@
 /**
- * Highcharts JS v4.2.0 (2105-12-15)
+ * Highcharts JS v4.2.2 (2016-02-04)
  * Highcharts Broken Axis module
  * 
  * License: www.highcharts.com/license
@@ -109,7 +109,7 @@
 
 			var axis = this;
 			
-			axis.doPostTranslate = true;
+			axis.isBroken = true;
 
 			this.val2lin = function (val) {
 				var nval = val,
@@ -314,7 +314,7 @@
 					if ((threshold < brk.from && y > brk.to) || (threshold > brk.from && y < brk.from)) { 
 						eventName = 'pointBreak';
 					} else if ((threshold < brk.from && y > brk.from && y < brk.to) || (threshold > brk.from && y > brk.to && y < brk.from)) { // point falls inside the break
-						eventName = 'pointInBreak'; // docs
+						eventName = 'pointInBreak';
 					} 
 					if (eventName) {
 						fireEvent(axis, eventName, { point: point, brk: brk });

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

@@ -2908,10 +2908,10 @@ if (CanvasRenderingContext2D) {
 		});
 	}
 }/**
- * @license Highcharts JS v4.2.0 (2105-12-15)
+ * @license Highcharts JS v4.2.2 (2016-02-04)
  * CanVGRenderer Extension module
  *
- * (c) 2011-2012 Torstein Honsi, Erik Olsson
+ * (c) 2011-2016 Torstein Honsi, Erik Olsson
  *
  * License: www.highcharts.com/license
  */

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

@@ -1,8 +1,8 @@
 /**
- * @license Highcharts JS v4.2.0 (2105-12-15)
+ * @license Highcharts JS v4.2.2 (2016-02-04)
  * Data module
  *
- * (c) 2012-2014 Torstein Honsi
+ * (c) 2012-2016 Torstein Honsi
  *
  * License: www.highcharts.com/license
  */

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

@@ -1,8 +1,8 @@
 /**
- * @license Highcharts JS v4.2.0 (2105-12-15)
+ * @license Highcharts JS v4.2.2 (2016-02-04)
  * Exporting module
  *
- * (c) 2010-2014 Torstein Honsi
+ * (c) 2010-2016 Torstein Honsi
  *
  * License: www.highcharts.com/license
  */
@@ -306,7 +306,7 @@ extend(Chart.prototype, {
 		// prepare for replicating the chart
 		options.series = [];
 		each(chart.series, function (serie) {
-			seriesOptions = merge(serie.options, {
+			seriesOptions = merge(serie.userOptions, { // #4912
 				animation: false, // turn off animation
 				enableMouseTracking: false,
 				showCheckbox: false,
@@ -678,7 +678,8 @@ extend(Chart.prototype, {
 		button = renderer.button(btnOptions.text, 0, 0, callback, attr, hover, select)
 			.attr({
 				title: chart.options.lang[btnOptions._titleKey],
-				'stroke-linecap': 'round'
+				'stroke-linecap': 'round',
+				zIndex: 3 // #4955
 			});
 		button.menuClassName = options.menuClassName || PREFIX + 'menu-' + chart.btnCount++;
 

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

@@ -2,7 +2,7 @@
  * @license 
  * Highcharts funnel module
  *
- * (c) 2010-2014 Torstein Honsi
+ * (c) 2010-2016 Torstein Honsi
  *
  * License: www.highcharts.com/license
  */
@@ -231,24 +231,30 @@ seriesTypes.funnel = Highcharts.extendClass(seriesTypes.pie, {
 		var series = this,
 			options = series.options,
 			chart = series.chart,
-			renderer = chart.renderer;
+			renderer = chart.renderer,
+			pointOptions,
+			pointAttr,
+			shapeArgs,
+			graphic;
 
 		each(series.data, function (point) {
-			var pointOptions = point.options,
-				graphic = point.graphic,
-				shapeArgs = point.shapeArgs;
+			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)
+			};
 
 			if (!graphic) { // Create the shapes				
 				point.graphic = renderer.path(shapeArgs)
-					.attr({
-						fill: point.color,
-						stroke: pick(pointOptions.borderColor, options.borderColor),
-						'stroke-width': pick(pointOptions.borderWidth, options.borderWidth)
-					})
+					.attr(pointAttr)
 					.add(series.group);
 					
 			} else { // Update the shapes
-				graphic.animate(shapeArgs);
+				graphic.attr(pointAttr).animate(shapeArgs);
 			}
 		});
 	},

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

@@ -1,7 +1,7 @@
 /**
- * @license Highcharts JS v4.2.0 (2105-12-15)
+ * @license Highcharts JS v4.2.2 (2016-02-04)
  *
- * (c) 2011-2014 Torstein Honsi
+ * (c) 2011-2016 Torstein Honsi
  *
  * License: www.highcharts.com/license
  */

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

@@ -1,8 +1,8 @@
 /**
- * @license Highcharts JS v4.2.0 (2105-12-15)
+ * @license Highcharts JS v4.2.2 (2016-02-04)
  * Plugin for displaying a message when there is no data visible in chart.
  *
- * (c) 2010-2014 Highsoft AS
+ * (c) 2010-2016 Highsoft AS
  * Author: Oystein Moseng
  *
  * License: www.highcharts.com/license

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

@@ -1,5 +1,5 @@
 /**
- * @license Highcharts JS v4.2.0 (2105-12-15)
+ * @license Highcharts JS v4.2.2 (2016-02-04)
  * Client side exporting module
  *
  * (c) 2015 Torstein Honsi / Oystein Moseng
@@ -57,53 +57,73 @@
 			l,
 			fallbackToExportServer = function () {
 				if (options.fallbackToExportServer === false) {
-					throw 'Fallback to export server disabled';
+					if (options.error) {
+						options.error();
+					} else {
+						throw 'Fallback to export server disabled';
+					}
+				} else {
+					chart.exportChart(options);
 				}
-				chart.exportChart(options);
 			},
 			// Get data:URL from image URL
 			// Pass in callbacks to handle results. finallyCallback is always called at the end of the process. Supplying this callback is optional.
 			// All callbacks receive two arguments: imageURL, and callbackArgs. callbackArgs is used only by callbacks and can contain whatever.
 			imageToDataUrl = function (imageURL, callbackArgs, successCallback, taintedCallback, noCanvasSupportCallback, failedLoadCallback, finallyCallback) {
-				var img = new win.Image();
-				if (!webKit) {
-					img.crossOrigin = 'Anonymous'; // For some reason Safari chokes on this attribute
-				}
-				img.onload = function () {
-					var canvas = doc.createElement('canvas'),
-						ctx = canvas.getContext && canvas.getContext('2d'),
-						dataURL;
-
-					if (!ctx) {
-						noCanvasSupportCallback(imageURL, callbackArgs);
-					} else {
-						canvas.height = img.height * scale;
-						canvas.width = img.width * scale;
-						ctx.drawImage(img, 0, 0, canvas.width, canvas.height);
-
-						// Now we try to get the contents of the canvas.
+				var img = new win.Image(),
+					taintedHandler,
+					loadHandler = function () {
+						var canvas = doc.createElement('canvas'),
+							ctx = canvas.getContext && canvas.getContext('2d'),
+							dataURL;
 						try {
-							dataURL = canvas.toDataURL();
-							successCallback(dataURL, callbackArgs);
-						} catch (e) {
-							// Failed - either tainted canvas or something else went horribly wrong
-							if (e.name === 'SecurityError' || e.name === 'SECURITY_ERR' || e.message === 'SecurityError') {
-								taintedCallback(imageURL, callbackArgs);
+							if (!ctx) {
+								noCanvasSupportCallback(imageURL, callbackArgs);
 							} else {
-								throw e;
+								canvas.height = img.height * scale;
+								canvas.width = img.width * scale;
+								ctx.drawImage(img, 0, 0, canvas.width, canvas.height);
+
+								// Now we try to get the contents of the canvas.
+								try {
+									dataURL = canvas.toDataURL();
+									successCallback(dataURL, callbackArgs);
+								} catch (e) {
+									// Failed - either tainted canvas or something else went horribly wrong
+									if (e.name === 'SecurityError' || e.name === 'SECURITY_ERR' || e.message === 'SecurityError') {
+										taintedHandler(imageURL, callbackArgs);
+									} else {
+										throw e;
+									}
+								}
+							}
+						} finally {
+							if (finallyCallback) {
+								finallyCallback(imageURL, callbackArgs);
 							}
 						}
-					}
-					if (finallyCallback) {
-						finallyCallback(imageURL, callbackArgs);
-					}
-				};
-				img.onerror = function () {
-					failedLoadCallback(imageURL, callbackArgs);
-					if (finallyCallback) {
-						finallyCallback(imageURL, callbackArgs);
-					}
+					},
+					// Image load failed (e.g. invalid URL)
+					errorHandler = function () {
+						failedLoadCallback(imageURL, callbackArgs);
+						if (finallyCallback) {
+							finallyCallback(imageURL, callbackArgs);
+						}
+					};
+				
+				// This is called on load if the image drawing to canvas failed with a security error.
+				// We retry the drawing with crossOrigin set to Anonymous.
+				taintedHandler = function () {
+					img = new win.Image();
+					taintedHandler = taintedCallback;
+					img.crossOrigin = 'Anonymous'; // Must be set prior to loading image source
+					img.onload = loadHandler;
+					img.onerror = errorHandler;
+					img.src = imageURL;
 				};
+
+				img.onload = loadHandler;
+				img.onerror = errorHandler;
 				img.src = imageURL;
 			},
 			// Get blob URL from SVG code. Falls back to normal data URI.
@@ -144,7 +164,7 @@
 					try {
 						windowRef = win.open(dataURL, 'chart');
 						if (windowRef === undefined || windowRef === null) {
-							throw 1;
+							throw 'Failed to open window';
 						}
 					} catch (e) {
 						// window.open failed, trying location.href

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

@@ -1,8 +1,8 @@
 /**
- * @license  Highcharts JS v4.2.0 (2105-12-15)
+ * @license  Highcharts JS v4.2.2 (2016-02-04)
  * Solid angular gauge module
  *
- * (c) 2010-2014 Torstein Honsi
+ * (c) 2010-2016 Torstein Honsi
  *
  * License: www.highcharts.com/license
  */
@@ -204,7 +204,8 @@
 					axisMinAngle = Math.min(yAxis.startAngleRad, yAxis.endAngleRad),
 					axisMaxAngle = Math.max(yAxis.startAngleRad, yAxis.endAngleRad),
 					minAngle,
-					maxAngle;
+					maxAngle,
+					attribs;
 
 				if (toColor === 'none') { // #3708
 					toColor = point.color || series.color || 'none';
@@ -245,14 +246,18 @@
 					if (d) {
 						shapeArgs.d = d; // animate alters it
 					}
-				} else {					
+				} else {
+					attribs = {
+						stroke: options.borderColor || 'none',
+						'stroke-width': options.borderWidth || 0,
+						fill: toColor,
+						'sweep-flag': 0
+					};
+					if (options.linecap !== 'square') {
+						attribs['stroke-linecap'] = attribs['stroke-linejoin'] = 'round';
+					}
 					point.graphic = renderer.arc(shapeArgs)
-						.attr({
-							stroke: options.borderColor || 'none',
-							'stroke-width': options.borderWidth || 0,
-							fill: toColor,
-							'sweep-flag': 0
-						})
+						.attr(attribs)
 						.add(series.group);
 				}
 			});

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

@@ -1,5 +1,5 @@
 /**
- * @license Highcharts JS v4.2.0 (2105-12-15)
+ * @license Highcharts JS v4.2.2 (2016-02-04)
  *
  * (c) 2014 Highsoft AS
  * Authors: Jon Arild Nygard / Oystein Moseng

data/lib/highcharts/version.rb

@@ -1,3 +1,3 @@
 module Highcharts
-  VERSION = "4.2.0"
+  VERSION = "4.2.2"
 end

metadata

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