highcharts-rails 2.1.9 → 2.2.0

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

@@ -1,5 +1,5 @@
 /**
- * @license Highcharts JS v2.1.9 (2011-11-11)
+ * @license Highcharts JS v2.2.0 (2012-02-16)
  * Exporting module
  *
  * (c) 2010-2011 Torstein Hønsi
@@ -105,7 +105,6 @@ defaultOptions.exporting = {
 	type: 'image/png',
 	url: 'http://export.highcharts.com/',
 	width: 800,
-	enableImages: false,
 	buttons: {
 		exportButton: {
 			//enabled: true,
@@ -141,16 +140,21 @@ defaultOptions.exporting = {
 						type: 'image/svg+xml'
 					});
 				}
-			}/*, {
+			}
+			// Enable this block to add "View SVG" to the dropdown menu
+			/*
+			,{
+
 				text: 'View SVG',
-				onclick: function() {
+				onclick: function () {
 					var svg = this.getSVG()
 						.replace(/</g, '\n&lt;')
 						.replace(/>/g, '&gt;');
 
-					doc.body.innerHTML = '<pre>'+ svg +'</pre>';
+					doc.body.innerHTML = '<pre>' + svg + '</pre>';
 				}
-			}*/]
+			} // */
+			]
 
 		},
 		printButton: {
@@ -182,9 +186,6 @@ extend(Chart.prototype, {
 			sandbox,
 			svg,
 			seriesOptions,
-			config,
-			pointOptions,
-			pointMarker,
 			options = merge(chart.options, additionalOptions); // copy the options and add extra options
 
 		// IE compatibility hack for generating SVG content that it doesn't really understand
@@ -214,56 +215,26 @@ extend(Chart.prototype, {
 			forExport: true
 		});
 		options.exporting.enabled = false; // hide buttons in print
-
-		if (!options.exporting.enableImages) {
-			options.chart.plotBackgroundImage = null; // the converter doesn't handle images
-		}
+		options.chart.plotBackgroundImage = null; // the converter doesn't handle images
 
 		// prepare for replicating the chart
 		options.series = [];
 		each(chart.series, function (serie) {
-			seriesOptions = serie.options;
+			seriesOptions = merge(serie.options, {
+				animation: false, // turn off animation
+				showCheckbox: false,
+				visible: serie.visible
+			});
 
-			seriesOptions.animation = false; // turn off animation
-			seriesOptions.showCheckbox = false;
-			seriesOptions.visible = serie.visible;
+			if (!seriesOptions.isInternal) { // used for the navigator series that has its own option set
 
-			if (!options.exporting.enableImages) {
 				// remove image markers
 				if (seriesOptions && seriesOptions.marker && /^url\(/.test(seriesOptions.marker.symbol)) {
 					seriesOptions.marker.symbol = 'circle';
 				}
-			}
-
-			seriesOptions.data = [];
-
-			each(serie.data, function (point) {
-
-				// extend the options by those values that can be expressed in a number or array config
-				config = point.config;
-				pointOptions = {
-					x: point.x,
-					y: point.y,
-					name: point.name
-				};
-
-				if (typeof config === 'object' && point.config && config.constructor !== Array) {
-					extend(pointOptions, config);
-				}
 
-				pointOptions.visible = point.visible;
-				seriesOptions.data.push(pointOptions); // copy fresh updated data
-
-				if (!options.exporting.enableImages) {
-					// remove image markers
-					pointMarker = point.config && point.config.marker;
-					if (pointMarker && /^url\(/.test(pointMarker.symbol)) {
-						delete pointMarker.symbol;
-					}
-				}
-			});
-
-			options.series.push(seriesOptions);
+				options.series.push(seriesOptions);
+			}
 		});
 
 		// generate the chart copy
@@ -299,9 +270,9 @@ extend(Chart.prototype, {
 			.replace(/jQuery[0-9]+="[^"]+"/g, '')
 			.replace(/isTracker="[^"]+"/g, '')
 			.replace(/url\([^#]+#/g, 'url(#')
-			.replace(/<svg /, '<svg xmlns:xlink="http://www.w3.org/1999/xlink" ')
-			.replace(/ href=/g, ' xlink:href=')
-			/*.replace(/preserveAspectRatio="none">/g, 'preserveAspectRatio="none"/>')*/
+			/*.replace(/<svg /, '<svg xmlns:xlink="http://www.w3.org/1999/xlink" ')
+			.replace(/ href=/, ' xlink:href=')
+			.replace(/preserveAspectRatio="none">/g, 'preserveAspectRatio="none"/>')*/
 			/* This fails in IE < 8
 			.replace(/([0-9]+)\.([0-9]+)/g, function(s1, s2, s3) { // round off to save weight
 				return s2 +'.'+ s3[0];
@@ -316,12 +287,6 @@ extend(Chart.prototype, {
 			.replace(/class=([^" ]+)/g, 'class="$1"')
 			.replace(/ transform /g, ' ')
 			.replace(/:(path|rect)/g, '$1')
-			.replace(/<img ([^>]*)>/gi, '<image $1 />')
-			.replace(/<\/image>/g, '') // remove closing tags for images as they'll never have any content
-			.replace(/<image ([^>]*)([^\/])>/gi, '<image $1$2 />') // closes image tags for firefox
-			.replace(/width=(\d+)/g, 'width="$1"')
-			.replace(/height=(\d+)/g, 'height="$1"')
-			.replace(/hc-svg-href="/g, 'xlink:href="')
 			.replace(/style="([^"]+)"/g, function (s) {
 				return s.toLowerCase();
 			});
@@ -344,7 +309,7 @@ extend(Chart.prototype, {
 	exportChart: function (options, chartOptions) {
 		var form,
 			chart = this,
-			svg = chart.getSVG(chartOptions);
+			svg = chart.getSVG(merge(chart.options.exporting.chartOptions, chartOptions)); // docs
 
 		// merge the options
 		options = merge(chart.options.exporting, options);
@@ -539,9 +504,6 @@ extend(Chart.prototype, {
 			btnOptions = merge(chart.options.navigation.buttonOptions, options),
 			onclick = btnOptions.onclick,
 			menuItems = btnOptions.menuItems,
-			/*position = chart.getAlignment(btnOptions),
-			buttonLeft = position.x,
-			buttonTop = position.y,*/
 			buttonWidth = btnOptions.width,
 			buttonHeight = btnOptions.height,
 			box,
@@ -555,7 +517,8 @@ extend(Chart.prototype, {
 			symbolAttr = {
 				stroke: btnOptions.symbolStroke,
 				fill: btnOptions.symbolFill
-			};
+			},
+			symbolSize = btnOptions.symbolSize || 12;
 
 		// Keeps references to the button elements
 		if (!chart.exportDivElements) {
@@ -620,8 +583,6 @@ extend(Chart.prototype, {
 			.on('click', revert)
 			.add();
 
-		//addEvent(button.element, 'click', revert);
-
 		// add the click event
 		if (menuItems) {
 			onclick = function () {
@@ -640,9 +601,10 @@ extend(Chart.prototype, {
 		// the icon
 		symbol = renderer.symbol(
 				btnOptions.symbol,
-				btnOptions.symbolX,
-				btnOptions.symbolY,
-				(btnOptions.symbolSize || 12) / 2
+				btnOptions.symbolX - (symbolSize / 2),
+				btnOptions.symbolY - (symbolSize / 2),
+				symbolSize,				
+				symbolSize
 			)
 			.align(btnOptions, true)
 			.attr(extend(symbolAttr, {
@@ -686,53 +648,67 @@ extend(Chart.prototype, {
 	}
 });
 
+/**
+ * Crisp for 1px stroke width, which is default. In the future, consider a smarter,
+ * global function.
+ */
+function crisp(arr) {
+	var i = arr.length;
+	while (i--) {
+		if (typeof arr[i] === 'number') {
+			arr[i] = Math.round(arr[i]) - 0.5;		
+		}
+	}
+	return arr;
+}
+
 // Create the export icon
-HC.Renderer.prototype.symbols.exportIcon = function (x, y, radius) {
-	return [
+HC.Renderer.prototype.symbols.exportIcon = function (x, y, width, height) {
+	return crisp([
 		M, // the disk
-		x - radius, y + radius,
+		x, y + width,
 		L,
-		x + radius, y + radius,
-		x + radius, y + radius * 0.5,
-		x - radius, y + radius * 0.5,
+		x + width, y + height,
+		x + width, y + height * 0.8,
+		x, y + height * 0.8,
 		'Z',
 		M, // the arrow
-		x, y + radius * 0.5,
+		x + width * 0.5, y + height * 0.8,
 		L,
-		x - radius * 0.5, y - radius / 3,
-		x - radius / 6, y - radius / 3,
-		x - radius / 6, y - radius,
-		x + radius / 6, y - radius,
-		x + radius / 6, y - radius / 3,
-		x + radius * 0.5, y - radius / 3,
+		x + width * 0.8, y + height * 0.4,
+		x + width * 0.4, y + height * 0.4,
+		x + width * 0.4, y,
+		x + width * 0.6, y,
+		x + width * 0.6, y + height * 0.4,
+		x + width * 0.2, y + height * 0.4,
 		'Z'
-	];
+	]);
 };
 // Create the print icon
-HC.Renderer.prototype.symbols.printIcon = function (x, y, radius) {
-	return [
+HC.Renderer.prototype.symbols.printIcon = function (x, y, width, height) {
+	return crisp([
 		M, // the printer
-		x - radius, y + radius * 0.5,
+		x, y + height * 0.7,
 		L,
-		x + radius, y + radius * 0.5,
-		x + radius, y - radius / 3,
-		x - radius, y - radius / 3,
+		x + width, y + height * 0.7,
+		x + width, y + height * 0.4,
+		x, y + height * 0.4,
 		'Z',
 		M, // the upper sheet
-		x - radius * 0.5, y - radius / 3,
+		x + width * 0.2, y + height * 0.4,
 		L,
-		x - radius * 0.5, y - radius,
-		x + radius * 0.5, y - radius,
-		x + radius * 0.5, y - radius / 3,
+		x + width * 0.2, y,
+		x + width * 0.8, y,
+		x + width * 0.8, y + height * 0.4,
 		'Z',
 		M, // the lower sheet
-		x - radius * 0.5, y + radius * 0.5,
+		x + width * 0.2, y + height * 0.7,
 		L,
-		x - radius * 0.75, y + radius,
-		x + radius * 0.75, y + radius,
-		x + radius * 0.5, y + radius * 0.5,
+		x, y + height,
+		x + width, y + height,
+		x + width * 0.8, y + height * 0.7,
 		'Z'
-	];
+	]);
 };
 
 

data/vendor/assets/javascripts/highcharts/themes/dark-blue.js

@@ -260,4 +260,4 @@ Highcharts.theme = {
 };
 
 // Apply the theme
-var highchartsOptions = Highcharts.setOptions(Highcharts.theme);
+var highchartsOptions = Highcharts.setOptions(Highcharts.theme);

data/vendor/assets/javascripts/highcharts/themes/dark-green.js

@@ -260,4 +260,4 @@ Highcharts.theme = {
 };
 
 // Apply the theme
-var highchartsOptions = Highcharts.setOptions(Highcharts.theme);
+var highchartsOptions = Highcharts.setOptions(Highcharts.theme);

data/vendor/assets/javascripts/highcharts/themes/grid.js

@@ -93,4 +93,3 @@ Highcharts.theme = {
 
 // Apply the theme
 var highchartsOptions = Highcharts.setOptions(Highcharts.theme);
-

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: highcharts-rails
 version: !ruby/object:Gem::Version
-  version: 2.1.9
+  version: 2.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-21 00:00:00.000000000 +01:00
+date: 2012-02-22 00:00:00.000000000 +01:00
 default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
-  requirement: &70222008063260 !ruby/object:Gem::Requirement
+  requirement: &70259245170160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,10 +22,10 @@ dependencies:
         version: '3.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70222008063260
+  version_requirements: *70259245170160
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70222008062620 !ruby/object:Gem::Requirement
+  requirement: &70259245169440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +33,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *70222008062620
+  version_requirements: *70259245169440
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70222008062160 !ruby/object:Gem::Requirement
+  requirement: &70259245168820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,7 +44,7 @@ dependencies:
         version: '3.1'
   type: :development
   prerelease: false
-  version_requirements: *70222008062160
+  version_requirements: *70259245168820
 description: Gem that includes Highcharts (Interactive JavaScript charts for your
   web projects), in the Rails Asset Pipeline introduced in Rails 3.1
 email:
@@ -65,6 +65,7 @@ files:
 - vendor/assets/javascripts/highcharts.js
 - vendor/assets/javascripts/highcharts/adapters/mootools.js
 - vendor/assets/javascripts/highcharts/adapters/prototype.js
+- vendor/assets/javascripts/highcharts/modules/canvas-tools.js
 - vendor/assets/javascripts/highcharts/modules/exporting.js
 - vendor/assets/javascripts/highcharts/themes/dark-blue.js
 - vendor/assets/javascripts/highcharts/themes/dark-green.js