highcharts-rails 3.0.2 → 3.0.3

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

@@ -5,26 +5,7 @@ var UNDEFINED,
 	ALLOWED_SHAPES,
 	Chart = Highcharts.Chart,
 	extend = Highcharts.extend,
-	each = Highcharts.each,
-	defaultOptions;
-
-defaultOptions = {
-	xAxis: 0,
-	yAxis: 0,
-	title: {
-		style: {},
-		text: "",
-		x: 0,
-		y: 0
-	},
-	shape: {
-		params: {
-			stroke: "#000000",
-			fill: "transparent",
-			strokeWidth: 2
-		}
-	}
-};
+	each = Highcharts.each;
 
 ALLOWED_SHAPES = ["path", "rect", "circle"];
 
@@ -42,6 +23,44 @@ ALIGN_FACTOR = {
 var inArray = HighchartsAdapter.inArray,
 	merge = Highcharts.merge;
 
+function defaultOptions(shapeType) {
+	var shapeOptions,
+		options;
+
+	options = {
+		xAxis: 0,
+		yAxis: 0,
+		title: {
+			style: {},
+			text: "",
+			x: 0,
+			y: 0
+		},
+		shape: {
+			params: {
+				stroke: "#000000",
+				fill: "transparent",
+				strokeWidth: 2
+			}
+		}
+	};
+
+	shapeOptions = {
+		circle: {
+			params: {
+				x: 0,
+				y: 0
+			}
+		}
+	};
+
+	if (shapeOptions[shapeType]) {
+		options.shape = merge(options.shape, shapeOptions[shapeType]);
+	}
+
+	return options;
+}
+
 function isArray(obj) {
 	return Object.prototype.toString.call(obj) === '[object Array]';
 }
@@ -54,6 +73,23 @@ function defined(obj) {
 	return obj !== UNDEFINED && obj !== null;
 }
 
+function translatePath(d, xAxis, yAxis, xOffset, yOffset) {
+	var len = d.length,
+		i = 0;
+
+	while (i < len) {
+		if (typeof d[i] === 'number' && typeof d[i + 1] === 'number') {
+			d[i] = xAxis.toPixels(d[i]) - xOffset;
+			d[i + 1] = yAxis.toPixels(d[i + 1]) - yOffset;
+			i += 2;
+		} else {
+			i += 1;
+		}
+	}
+
+	return d;
+}
+
 
 // Define annotation prototype
 var Annotation = function () {
@@ -64,8 +100,10 @@ Annotation.prototype = {
 	 * Initialize the annotation
 	 */
 	init: function (chart, options) {
+		var shapeType = options.shape && options.shape.type;
+
 		this.chart = chart;
-		this.options = merge({}, defaultOptions, options);
+		this.options = merge({}, defaultOptions(shapeType), options);
 	},
 
 	/*
@@ -86,16 +124,17 @@ Annotation.prototype = {
 			group = annotation.group = renderer.g();
 		}
 
-		if (!title && titleOptions) {
-			title = annotation.title = renderer.label(titleOptions);
-			title.add(group);
-		}
 
 		if (!shape && shapeOptions && inArray(shapeOptions.type, ALLOWED_SHAPES) !== -1) {
 			shape = annotation.shape = renderer[options.shape.type](shapeOptions.params);
 			shape.add(group);
 		}
 
+		if (!title && titleOptions) {
+			title = annotation.title = renderer.label(titleOptions);
+			title.add(group);
+		}
+
 		group.add(chart.annotations.group);
 
 		// link annotations to point or series
@@ -152,10 +191,9 @@ Annotation.prototype = {
 
 
 		// Based on given options find annotation pixel position
-		x = (defined(options.xValue) ? xAxis.toPixels(options.xValue + xAxis.minPointOffset) : options.x) - xAxis.minPixelPadding;
+		x = (defined(options.xValue) ? xAxis.toPixels(options.xValue + xAxis.minPointOffset) - xAxis.minPixelPadding : options.x);
 		y = defined(options.yValue) ? yAxis.toPixels(options.yValue) : options.y;
 
-
 		if (isNaN(x) || isNaN(y) || !isNumber(x) || !isNumber(y)) {
 			return;
 		}
@@ -187,6 +225,15 @@ Annotation.prototype = {
 					shapeParams.x += xAxis.minPixelPadding;
 				}
 
+				if (options.shape.type === 'path') {
+					translatePath(shapeParams.d, xAxis, yAxis, x, y);
+				}
+			}
+
+			// move the center of the circle to shape x/y
+			if (options.shape.type === 'circle') {
+				shapeParams.x += shapeParams.r;
+				shapeParams.y += shapeParams.r;
 			}
 
 			resetBBox = true;

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

@@ -2908,7 +2908,7 @@ if (CanvasRenderingContext2D) {
 		});
 	}
 }/**
- * @license Highcharts JS v3.0.2 (2013-06-05)
+ * @license Highcharts JS v3.0.3 (2013-07-31)
  * CanVGRenderer Extension module
  *
  * (c) 2011-2012 Torstein Hønsi, Erik Olsson

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

@@ -2,7 +2,7 @@
  * @license Data plugin for Highcharts
  *
  * (c) 2012-2013 Torstein Hønsi
- * Last revision 2012-11-27
+ * Last revision 2013-06-07
  *
  * License: www.highcharts.com/license
  */
@@ -87,8 +87,8 @@
 	
 	
 	// The Data constructor
-	var Data = function (options) {
-		this.init(options);
+	var Data = function (dataOptions, chartOptions) {
+		this.init(dataOptions, chartOptions);
 	};
 	
 	// Set the prototype properties
@@ -97,8 +97,9 @@
 	/**
 	 * Initialize the Data object with the given options
 	 */
-	init: function (options) {
+	init: function (options, chartOptions) {
 		this.options = options;
+		this.chartOptions = chartOptions;
 		this.columns = options.columns || this.rowsToColumns(options.rows) || [];
 
 		// No need to parse or interpret anything
@@ -120,6 +121,30 @@
 
 	},
 
+	/**
+	 * Get the column distribution. For example, a line series takes a single column for 
+	 * Y values. A range series takes two columns for low and high values respectively,
+	 * and an OHLC series takes four columns.
+	 */
+	getColumnDistribution: function () {
+		var chartOptions = this.chartOptions,
+			getValueCount = function (type) {
+				return (Highcharts.seriesTypes[type || 'line'].prototype.pointArrayMap || [0]).length;
+			},
+			globalType = chartOptions && chartOptions.chart && chartOptions.chart.type,
+			individualCounts = [];
+
+		each((chartOptions && chartOptions.series) || [], function (series) {
+			individualCounts.push(getValueCount(series.type || globalType));
+		});
+
+		this.valueCount = {
+			global: getValueCount(globalType),
+			individual: individualCounts
+		};
+	},
+
+
 	dataFound: function () {
 		// Interpret the values into right types
 		this.parseTypes();
@@ -436,19 +461,20 @@
 	complete: function () {
 		
 		var columns = this.columns,
-			hasXData,
-			categories,
 			firstCol,
 			type,
 			options = this.options,
+			valueCount,
 			series,
 			data,
-			name,
 			i,
-			j;
+			j,
+			seriesIndex;
 			
 		
 		if (options.complete) {
+
+			this.getColumnDistribution();
 			
 			// Use first column for X data or categories?
 			if (columns.length > 1) {
@@ -457,42 +483,61 @@
 					firstCol.shift(); // remove the first cell
 				}
 				
-				// Use the first column for categories or X values
-				hasXData = firstCol.isNumeric || firstCol.isDatetime;
-				if (!hasXData) { // means type is neither datetime nor linear
-					categories = firstCol;
-				}
 				
 				if (firstCol.isDatetime) {
 					type = 'datetime';
+				} else if (!firstCol.isNumeric) {
+					type = 'category';
 				}
 			}
-			
-			// Use the next columns for series
-			series = [];
+
+			// Get the names and shift the top row
 			for (i = 0; i < columns.length; i++) {
 				if (this.headerRow === 0) {
-					name = columns[i].shift();
+					columns[i].name = columns[i].shift();
 				}
+			}
+			
+			// Use the next columns for series
+			series = [];
+			for (i = 0, seriesIndex = 0; i < columns.length; seriesIndex++) {
+
+				// This series' value count
+				valueCount = Highcharts.pick(this.valueCount.individual[seriesIndex], this.valueCount.global);
+				
+				// Iterate down the cells of each column and add data to the series
 				data = [];
 				for (j = 0; j < columns[i].length; j++) {
-					data[j] = columns[i][j] !== undefined ?
-						(hasXData ?
-							[firstCol[j], columns[i][j]] :
-							columns[i][j]
-						) :
-						null;
+					data[j] = [
+						firstCol[j], 
+						columns[i][j] !== undefined ? columns[i][j] : null
+					];
+					if (valueCount > 1) {
+						data[j].push(columns[i + 1][j] !== undefined ? columns[i + 1][j] : null);
+					}
+					if (valueCount > 2) {
+						data[j].push(columns[i + 2][j] !== undefined ? columns[i + 2][j] : null);
+					}
+					if (valueCount > 3) {
+						data[j].push(columns[i + 3][j] !== undefined ? columns[i + 3][j] : null);
+					}
+					if (valueCount > 4) {
+						data[j].push(columns[i + 4][j] !== undefined ? columns[i + 4][j] : null);
+					}
 				}
-				series[i] = {
-					name: name,
+
+				// Add the series
+				series[seriesIndex] = {
+					name: columns[i].name,
 					data: data
 				};
+
+				i += valueCount;
 			}
 			
 			// Do the callback
 			options.complete({
 				xAxis: {
-					categories: categories,
 					type: type
 				},
 				series: series
@@ -503,8 +548,8 @@
 	
 	// Register the Data prototype and data function on Highcharts
 	Highcharts.Data = Data;
-	Highcharts.data = function (options) {
-		return new Data(options);
+	Highcharts.data = function (options, chartOptions) {
+		return new Data(options, chartOptions);
 	};
 
 	// Extend Chart.init so that the Chart constructor accepts a new configuration
@@ -528,7 +573,7 @@
 
 					proceed.call(chart, userOptions, callback);
 				}
-			}));
+			}), userOptions);
 		} else {
 			proceed.call(chart, userOptions, callback);
 		}

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

@@ -1,5 +1,5 @@
 /**
- * @license Highcharts JS v3.0.2 (2013-06-05)
+ * @license Highcharts JS v3.0.3 (2013-07-31)
  * Exporting module
  *
  * (c) 2010-2013 Torstein Hønsi
@@ -269,7 +269,7 @@ extend(Chart.prototype, {
 					userMin = extremes.userMin,
 					userMax = extremes.userMax;
 
-				if (userMin !== UNDEFINED || userMax !== UNDEFINED) {
+				if (axisCopy && (userMin !== UNDEFINED || userMax !== UNDEFINED)) {
 					axisCopy.setExtremes(userMin, userMax, true, false);
 				}
 			});
@@ -319,9 +319,6 @@ extend(Chart.prototype, {
 		// IE9 beta bugs with innerHTML. Test again with final IE9.
 		svg = svg.replace(/(url\(#highcharts-[0-9]+)"/g, '$1')
 			.replace(/"/g, "'");
-		if (svg.match(/ xmlns="/g).length === 2) {
-			svg = svg.replace(/xmlns="[^"]+"/, '');
-		}
 
 		return svg;
 	},
@@ -342,8 +339,8 @@ extend(Chart.prototype, {
 				chartOptions, 
 				{
 					exporting: {
-						sourceWidth: options.sourceWidth || chartExportingOptions.sourceWidth, // docs: option and parameter in exportChart()
-						sourceHeight: options.sourceHeight || chartExportingOptions.sourceHeight // docs
+						sourceWidth: options.sourceWidth || chartExportingOptions.sourceWidth,
+						sourceHeight: options.sourceHeight || chartExportingOptions.sourceHeight
 					}
 				}
 			));
@@ -519,7 +516,7 @@ extend(Chart.prototype, {
 			menuStyle.left = (x - menuPadding) + PX;
 		}
 		// if outside bottom, bottom align it
-		if (y + height + chart.exportMenuHeight > chartHeight) {
+		if (y + height + chart.exportMenuHeight > chartHeight && button.alignOptions.verticalAlign !== 'top') {
 			menuStyle.bottom = (chartHeight - y - menuPadding)  + PX;
 		} else {
 			menuStyle.top = (y + height - menuPadding) + PX;

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

@@ -94,7 +94,7 @@ seriesTypes.funnel = Highcharts.extendClass(seriesTypes.pie, {
 
 		// Return the width at a specific y coordinate
 		series.getWidthAt = getWidthAt = function (y) {
-			return y > height - neckHeight ?
+			return y > height - neckHeight || height === neckHeight ?
 				neckWidth :
 				neckWidth + (width - neckWidth) * ((height - neckHeight - y) / (height - neckHeight));
 		};
@@ -137,7 +137,7 @@ seriesTypes.funnel = Highcharts.extendClass(seriesTypes.pie, {
 			// set start and end positions
 			y5 = null;
 			fraction = sum ? point.y / sum : 0;
-			y1 = cumulative * height;
+			y1 = centerY - height / 2 + cumulative * height;
 			y3 = y1 + fraction * height;
 			//tempWidth = neckWidth + (width - neckWidth) * ((height - neckHeight - y1) / (height - neckHeight));
 			tempWidth = getWidthAt(y1);

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

@@ -0,0 +1,57 @@
+(function (Highcharts) {
+	var seriesTypes = Highcharts.seriesTypes,
+		each = Highcharts.each;
+	
+	seriesTypes.heatmap = Highcharts.extendClass(seriesTypes.map, {
+		colorKey: 'z',
+		pointArrayMap: ['y', 'z'],
+		translate: function () {
+			var series = this,
+				options = series.options,
+				dataMin = Number.MAX_VALUE,
+				dataMax = Number.MIN_VALUE,
+				opacity,
+				minOpacity = options.minOpacity,
+				path,
+				color;
+			
+
+			series.generatePoints();
+	
+			each(series.data, function (point) {
+				var x = point.x,
+					y = point.y,
+					value = point.z,
+					xPad = (series.options.colsize || 1) / 2,
+					yPad = (series.options.rowsize || 1) / 2;
+
+				point.path = [
+					'M', x - xPad, y - yPad,
+					'L', x + xPad, y - yPad,
+					'L', x + xPad, y + yPad,
+					'L', x - xPad, y + yPad,
+					'Z'
+				];
+				
+				point.shapeType = 'path';
+				point.shapeArgs = {
+					d: series.translatePath(point.path)
+				};
+				
+				if (typeof value === 'number') {
+					if (value > dataMax) {
+						dataMax = value;
+					} else if (value < dataMin) {
+						dataMin = value;
+					}
+				}
+			});
+			
+			series.translateColors(dataMin, dataMax);
+		},
+		
+		getBox: function () {}
+			
+	});
+	
+}(Highcharts));