RubyGems - highcharts-rails - Versions diffs - 4.1.7 → 4.1.8 - Mend

highcharts-rails 4.1.7 → 4.1.8

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (19) hide show

checksums.yaml +4 -4
data/CHANGELOG.markdown +56 -0
data/Rakefile +36 -0
data/app/assets/javascripts/highcharts.js +331 -222
data/app/assets/javascripts/highcharts/adapters/standalone-framework.js +7 -3
data/app/assets/javascripts/highcharts/highcharts-3d.js +24 -11
data/app/assets/javascripts/highcharts/highcharts-more.js +25 -14
data/app/assets/javascripts/highcharts/modules/boost.js +554 -0
data/app/assets/javascripts/highcharts/modules/broken-axis.js +17 -10
data/app/assets/javascripts/highcharts/modules/canvas-tools.js +1 -1
data/app/assets/javascripts/highcharts/modules/data.js +1 -1
data/app/assets/javascripts/highcharts/modules/exporting.js +32 -7
data/app/assets/javascripts/highcharts/modules/heatmap.js +24 -5
data/app/assets/javascripts/highcharts/modules/no-data-to-display.js +1 -1
data/app/assets/javascripts/highcharts/modules/offline-exporting.js +276 -0
data/app/assets/javascripts/highcharts/modules/solid-gauge.js +10 -9
data/app/assets/javascripts/highcharts/modules/treemap.js +1 -1
data/lib/highcharts/version.rb +1 -1
metadata +3 -1

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

@@ -1,5 +1,5 @@
 /**
- * Highcharts JS v4.1.7 (2015-06-26)
+ * Highcharts JS v4.1.8 (2015-08-20)
  * Highcharts Broken Axis module
  *
  * Author: Stephane Vanraes, Torstein Honsi
@@ -24,16 +24,18 @@
 	extend(Axis.prototype, {
 		isInBreak: function (brk, val) {
-			var repeat = brk.repeat || Infinity,
+			var ret,
+				repeat = brk.repeat || Infinity,
 				from = brk.from,
 				length = brk.to - brk.from,
 				test = (val >= from ? (val - from) % repeat :  repeat - ((from - val) % repeat));
 			if (!brk.inclusive) {
-				return (test < length && test !== 0);
+				ret = test < length && test !== 0;
 			} else {
-				return (test <= length);
+				ret = test <= length;
 			}
+			return ret;
 		},
 		isInAnyBreak: function (val, testKeep) {
@@ -286,6 +288,8 @@
 			points = series.points,
 			yAxis = series.yAxis,
 			breaks = yAxis.breakArray || [],
+			threshold = pick(this.options.threshold, yAxis.min),
+			eventName,
 			point,
 			brk,
 			i,
@@ -297,12 +301,15 @@
 			y = point.stackY || point.y;
 			for (j = 0; j < breaks.length; j++) {
 				brk = breaks[j];
-				if (y < brk.from) {
-					break;
-				} else if (y > brk.to) {
-					fireEvent(yAxis, 'pointBreak', {point: point, brk: brk});
-				} else {
-					fireEvent(yAxis, 'pointInBreak', {point: point, brk: brk});
+				eventName = false;
+				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
+				}
+				if (eventName) {
+					fireEvent(yAxis, eventName, {point: point, brk: brk});
 				}
 			}
 		}

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

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

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

@@ -1,5 +1,5 @@
 /**
- * @license Highcharts JS v4.1.7 (2015-06-26)
+ * @license Highcharts JS v4.1.8 (2015-08-20)
  * Data module
  *
  * (c) 2012-2014 Torstein Honsi

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

@@ -1,5 +1,5 @@
 /**
- * @license Highcharts JS v4.1.7 (2015-06-26)
+ * @license Highcharts JS v4.1.8 (2015-08-20)
  * Exporting module
  *
  * (c) 2010-2014 Torstein Honsi
@@ -233,6 +233,13 @@ extend(Chart.prototype, {
 			});
 	},
+	/**
+	 * Return innerHTML of chart. Used as hook for plugins.
+	 */
+	getChartHTML: function () {
+		return this.container.innerHTML;
+	},
 	/**
 	 * Return an SVG representation of the chart
 	 *
@@ -248,7 +255,10 @@ extend(Chart.prototype, {
 			sourceHeight,
 			cssWidth,
 			cssHeight,
-			options = merge(chart.options, additionalOptions); // copy the options and add extra options
+			html,
+			options = merge(chart.options, additionalOptions), // copy the options and add extra options
+			allowHTML = options.exporting.allowHTML; // docs: experimental, see #2473
 		// IE compatibility hack for generating SVG content that it doesn't really understand
 		if (!doc.createElementNS) {
@@ -283,7 +293,7 @@ extend(Chart.prototype, {
 		extend(options.chart, {
 			animation: false,
 			renderTo: sandbox,
-			forExport: true,
+			forExport: !allowHTML,
 			width: sourceWidth,
 			height: sourceHeight
 		});
@@ -332,13 +342,26 @@ extend(Chart.prototype, {
 		});
 		// get the SVG from the container's innerHTML
-		svg = chartCopy.container.innerHTML;
+		svg = chartCopy.getChartHTML();
 		// free up memory
 		options = null;
 		chartCopy.destroy();
 		discardElement(sandbox);
+		// Move HTML into a foreignObject
+		if (allowHTML) {
+			html = svg.match(/<\/svg>(.*?$)/);
+			if (html) {
+				html = '<foreignObject x="0" y="0 width="200" height="200">' +
+					'<body xmlns="http://www.w3.org/1999/xhtml">' +
+					html[1] +
+					'</body>' +
+					'</foreignObject>';
+				svg = svg.replace('</svg>', html + '</svg>');
+			}
+		}
 		// sanitize
 		svg = this.sanitizeSVG(svg);
@@ -530,7 +553,8 @@ extend(Chart.prototype, {
 							onmouseout: function () {
 								css(this, menuItemStyle);
 							},
-							onclick: function () {
+							onclick: function (e) {
+								e.stopPropagation();
 								hide();
 								if (item.onclick) {
 									item.onclick.apply(chart, arguments);
@@ -613,8 +637,9 @@ extend(Chart.prototype, {
 		delete attr.states;
 		if (onclick) {
-			callback = function () {
-				onclick.apply(chart, arguments);
+			callback = function (e) {
+				e.stopPropagation();
+				onclick.call(chart, e);
 			};
 		} else if (menuItems) {

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

@@ -1,5 +1,5 @@
 /**
- * @license Highcharts JS v4.1.7 (2015-06-26)
+ * @license Highcharts JS v4.1.8 (2015-08-20)
  *
  * (c) 2011-2014 Torstein Honsi
  *
@@ -17,6 +17,7 @@ var UNDEFINED,
 	Legend = Highcharts.Legend,
 	LegendSymbolMixin = Highcharts.LegendSymbolMixin,
 	Series = Highcharts.Series,
+	Point = Highcharts.Point,
 	defaultOptions = Highcharts.getOptions(),
 	each = Highcharts.each,
@@ -42,6 +43,8 @@ extend(ColorAxis.prototype, Axis.prototype);
 extend(ColorAxis.prototype, {
 	defaultColorAxisOptions: {
 		lineWidth: 0,
+		minPadding: 0,
+		maxPadding: 0,
 		gridLineWidth: 1,
 		tickPixelInterval: 72,
 		startOnTick: true,
@@ -70,7 +73,6 @@ extend(ColorAxis.prototype, {
 			side: horiz ? 2 : 1,
 			reversed: !horiz
 		}, userOptions, {
-			isX: horiz,
 			opposite: !horiz,
 			showEmpty: false,
 			title: null,
@@ -89,7 +91,6 @@ extend(ColorAxis.prototype, {
 		this.initStops(userOptions);
 		// Override original axis properties
-		this.isXAxis = true;
 		this.horiz = horiz;
 		this.zoomEnabled = false;
 	},
@@ -392,7 +393,7 @@ extend(ColorAxis.prototype, {
 		});
 		// When updating data classes, destroy old items and make sure new ones are created (#3207)
-		if (newOptions.dataClasses) {
+		if (newOptions.dataClasses && legend.allItems) {
 			each(legend.allItems, function (item) {
 				if (item.isDataClass) {
 					item.legendGroup.destroy();
@@ -531,6 +532,22 @@ wrap(Legend.prototype, 'getAllItems', function (proceed) {
 });/**
  * Mixin for maps and heatmaps
  */
+var colorPointMixin = {
+	/**
+	 * Set the visibility of a single point
+	 */
+	setVisible: function (vis) {
+		var point = this,
+			method = vis ? 'show' : 'hide';
+		// Show and hide associated elements
+		each(['graphic', 'dataLabel'], function (key) {
+			if (point[key]) {
+				point[key][method]();
+			}
+		});
+	}
+};
 var colorSeriesMixin = {
 	pointAttrToOptions: { // mapping between SVG attributes and the corresponding options
@@ -560,7 +577,8 @@ var colorSeriesMixin = {
 			var value = point[colorKey],
 				color;
-			color = value === null ? nullColor : (colorAxis && value !== undefined) ? colorAxis.toColor(value, point) : point.color || series.color;
+			color = point.options.color ||
+				(value === null ? nullColor : (colorAxis && value !== undefined) ? colorAxis.toColor(value, point) : point.color || series.color);
 			if (color) {
 				point.color = color;
@@ -606,6 +624,7 @@ seriesTypes.heatmap = extendClass(seriesTypes.scatter, merge(colorSeriesMixin, {
 	type: 'heatmap',
 	pointArrayMap: ['y', 'value'],
 	hasPointSpecificOptions: true,
+	pointClass: extendClass(Point, colorPointMixin),
 	supportsDrilldown: true,
 	getExtremesFromAll: true,
 	directTouch: true,

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

@@ -1,5 +1,5 @@
 /**
- * @license Highcharts JS v4.1.7 (2015-06-26)
+ * @license Highcharts JS v4.1.8 (2015-08-20)
  * Plugin for displaying a message when there is no data visible in chart.
  *
  * (c) 2010-2014 Highsoft AS

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

@@ -0,0 +1,276 @@
+/**
+ * @license Highcharts JS v4.1.8 (2015-08-20)
+ * Client side exporting module
+ *
+ * (c) 2015 Torstein Honsi / Oystein Moseng
+ *
+ * License: www.highcharts.com/license
+ */
+// JSLint options:
+/*global Highcharts, HighchartsAdapter, document, window, Blob, MSBlobBuilder */
+(function (Highcharts) {
+// Dummy object so we can reuse our canvas-tools.js without errors
+Highcharts.CanVGRenderer = {};
+/**
+ * Add a new method to the Chart object to perform a local download
+ */
+Highcharts.Chart.prototype.exportChartLocal = function (exportingOptions, chartOptions) {
+	var chart = this,
+		options = Highcharts.merge(chart.options.exporting, exportingOptions),
+		webKit = navigator.userAgent.indexOf('WebKit') > -1 && navigator.userAgent.indexOf("Chrome") < 0, // Webkit and not chrome
+		scale = options.scale || 2,
+		chartCopyContainer,
+		domurl = window.URL || window.webkitURL || window,
+		images,
+		imagesEmbedded = 0,
+		el,
+		i,
+		l,
+		fallbackToExportServer = function () {
+			if (options.fallbackToExportServer === false) {
+				throw 'Fallback to export server disabled';
+			}
+			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 Image();
+			if (!webKit) {
+				img.crossOrigin = 'Anonymous'; // For some reason Safari chokes on this attribute
+			}
+			img.onload = function () {
+				var canvas = document.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.
+					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);
+						} else {
+							throw e;
+						}
+					}
+				}
+				if (finallyCallback) {
+					finallyCallback(imageURL, callbackArgs);
+				}
+			};
+			img.onerror = function () {
+				failedLoadCallback(imageURL, callbackArgs);
+				if (finallyCallback) {
+					finallyCallback(imageURL, callbackArgs);
+				}
+			};
+			img.src = imageURL;
+		},
+		// Get blob URL from SVG code. Falls back to normal data URI.
+		svgToDataUrl = function (svg) {
+			try {
+				// Safari requires data URI since it doesn't allow navigation to blob URLs
+				if (!webKit) {
+					return domurl.createObjectURL(new Blob([svg], { type: 'image/svg+xml;charset-utf-16'}));
+				}
+			} catch (e) {
+				// Ignore
+			}
+			return 'data:image/svg+xml;charset=UTF-8,' + encodeURIComponent(svg);
+		},
+		// Download contents by dataURL/blob
+		download = function (dataURL, extension) {
+			var a = document.createElement('a'),
+				filename = (options.filename || 'chart') + '.' + extension,
+				windowRef;
+			// IE specific blob implementation
+			if (navigator.msSaveOrOpenBlob) {
+				navigator.msSaveOrOpenBlob(dataURL, filename);
+				return;
+			}
+			// Try HTML5 download attr if supported
+			if (typeof a.download !== 'undefined') {
+				a.href = dataURL;
+				a.download = filename; // HTML5 download attribute
+				a.target = '_blank';
+				document.body.appendChild(a);
+				a.click();
+				document.body.removeChild(a);
+			} else {
+				// No download attr, just opening data URI
+				try {
+					windowRef = window.open(dataURL, 'chart');
+					if (typeof windowRef === 'undefined' || windowRef === null) {
+						throw 1;
+					}
+				} catch (e) {
+					// window.open failed, trying location.href
+					window.location.href = dataURL;
+				}
+			}
+		},
+		// Get data URL to an image of the chart and call download on it
+		initiateDownload = function () {
+			var svgurl,
+				blob,
+				svg = chart.sanitizeSVG(chartCopyContainer.innerHTML); // SVG of chart copy
+			// Initiate download depending on file type
+			if (options && options.type === 'image/svg+xml') {
+				// SVG download. In this case, we want to use Microsoft specific Blob if available
+				try {
+					if (navigator.msSaveOrOpenBlob) {
+						blob = new MSBlobBuilder();
+						blob.append(svg);
+						svgurl = blob.getBlob('image/svg+xml');
+					} else {
+						svgurl = svgToDataUrl(svg);
+					}
+					download(svgurl, 'svg');
+				} catch (e) {
+					fallbackToExportServer();
+				}
+			} else {
+				// PNG download - create bitmap from SVG
+				// First, try to get PNG by rendering on canvas
+				svgurl = svgToDataUrl(svg);
+				imageToDataUrl(svgurl, { /* args */ }, function (imageURL) {
+					// Success
+					try {
+						download(imageURL, 'png');
+					} catch (e) {
+						fallbackToExportServer();
+					}
+				}, function () {
+					// Failed due to tainted canvas
+					// Create new and untainted canvas
+					var canvas = document.createElement('canvas'),
+						ctx = canvas.getContext('2d'),
+						imageWidth = svg.match(/^<svg[^>]*width\s*=\s*\"?(\d+)\"?[^>]*>/)[1] * scale,
+						imageHeight = svg.match(/^<svg[^>]*height\s*=\s*\"?(\d+)\"?[^>]*>/)[1] * scale,
+						downloadWithCanVG = function () {
+							ctx.drawSvg(svg, 0, 0, imageWidth, imageHeight);
+							try {
+								download(navigator.msSaveOrOpenBlob ? canvas.msToBlob() : canvas.toDataURL('image/png'), 'png');
+							} catch (e) {
+								fallbackToExportServer();
+							}
+						};
+					canvas.width = imageWidth;
+					canvas.height = imageHeight;
+					if (window.canvg) {
+						// Use preloaded canvg
+						downloadWithCanVG();
+					} else {
+						// Must load canVG first
+						chart.showLoading();
+						HighchartsAdapter.getScript(Highcharts.getOptions().global.canvasToolsURL, function () {
+							chart.hideLoading();
+							downloadWithCanVG();
+						});
+					}
+				},
+				// No canvas support
+				fallbackToExportServer,
+				// Failed to load image
+				fallbackToExportServer,
+				// Finally
+				function () {
+					try {
+						domurl.revokeObjectURL(svgurl);
+					} catch (e) {
+						// Ignore
+					}
+				});
+			}
+		};
+	// Hook into getSVG to get a copy of the chart copy's container
+	Highcharts.wrap(Highcharts.Chart.prototype, 'getChartHTML', function (proceed) {
+		chartCopyContainer = this.container.cloneNode(true);
+		return proceed.apply(this, Array.prototype.slice.call(arguments, 1));
+	});
+	// Trigger hook to get chart copy
+	chart.getSVGForExport(options, chartOptions);
+	images = chartCopyContainer.getElementsByTagName('image');
+	try {
+		// If there are no images to embed, just go ahead and start the download process
+		if (!images.length) {
+			initiateDownload();
+		}
+		// Success handler, we converted image to base64!
+		function embeddedSuccess(imageURL, callbackArgs) {
+			++imagesEmbedded;
+			// Change image href in chart copy
+			callbackArgs.imageElement.setAttributeNS('http://www.w3.org/1999/xlink', 'href', imageURL);
+			// Start download when done with the last image
+			if (imagesEmbedded === images.length) {
+				initiateDownload();
+			}
+		}
+		// Go through the images we want to embed
+		for (i = 0, l = images.length; i < l; ++i) {
+			el = images[i];
+			imageToDataUrl(el.getAttributeNS('http://www.w3.org/1999/xlink', 'href'), { imageElement: el },
+				embeddedSuccess,
+				// Tainted canvas
+				fallbackToExportServer,
+				// No canvas support
+				fallbackToExportServer,
+				// Failed to load source
+				fallbackToExportServer
+			);
+		}
+	} catch (e) {
+		fallbackToExportServer();
+	}
+};
+// Extend the default options to use the local exporter logic
+Highcharts.getOptions().exporting.buttons.contextButton.menuItems = [{
+	textKey: 'printChart',
+	onclick: function () {
+		this.print();
+	}
+}, {
+	separator: true
+}, {
+	textKey: 'downloadPNG',
+	onclick: function () {
+		this.exportChartLocal();
+	}
+}, {
+	textKey: 'downloadSVG',
+	onclick: function () {
+		this.exportChartLocal({
+			type: 'image/svg+xml'
+		});
+	}
+}];
+}(Highcharts));