highcharts-rails 4.2.5 → 4.2.6

data/app/assets/javascripts/highcharts/highcharts-more.js

@@ -2,7 +2,7 @@
 // @compilation_level SIMPLE_OPTIMIZATIONS
 
 /**
- * @license Highcharts JS v4.2.5 (2016-05-06)
+ * @license Highcharts JS v4.2.6 (2016-08-02)
  *
  * (c) 2009-2016 Torstein Honsi
  *
@@ -364,6 +364,7 @@ var arrayMin = Highcharts.arrayMin,
                     options.innerRadius,
                     pick(options.thickness, 10)
                 ],
+                offset = Math.min(this.offset, 0),
                 percentRegex = /%$/,
                 start,
                 end,
@@ -406,6 +407,8 @@ var arrayMin = Highcharts.arrayMin,
                     end = startAngleRad + this.translate(to);
                 }
 
+                radii[0] -= offset; // #5283
+                radii[2] -= offset; // #5283
 
                 ret = this.chart.renderer.symbols.arc(
                     this.left + center[0],
@@ -822,7 +825,15 @@ var arrayMin = Highcharts.arrayMin,
             if (!this.chart.polar && higherAreaPath[0] === 'M') {
                 higherAreaPath[0] = 'L'; // this probably doesn't work for spline        
             }
+
+            this.graphPath = linePath;
             this.areaPath = this.areaPath.concat(lowerPath, higherAreaPath);
+
+            // Prepare for sideways animation
+            linePath.isArea = true;
+            linePath.xMap = lowerPath.xMap;
+            this.areaPath.xMap = lowerPath.xMap;
+
             return linePath;
         },
 
@@ -1120,6 +1131,7 @@ var arrayMin = Highcharts.arrayMin,
         drawGraph: noop,
         fixedBox: true,
         forceDL: true,
+        noSharedTooltip: true,
         trackerGroups: ['group', 'dataLabelsGroup'],
 
         /**
@@ -1802,7 +1814,7 @@ var arrayMin = Highcharts.arrayMin,
                 options = series.options,
                 stateOptions = options.states,
                 upColor = options.upColor || series.color,
-                hoverColor = Highcharts.Color(upColor).brighten(0.1).get(),
+                hoverColor = Highcharts.Color(upColor).brighten(options.states.hover.brightness).get(),
                 seriesDownPointAttr = merge(series.pointAttr),
                 upColorProp = series.upColorProp;
 
@@ -1880,8 +1892,19 @@ var arrayMin = Highcharts.arrayMin,
      */
     defaultPlotOptions.polygon = merge(defaultPlotOptions.scatter, {
         marker: {
-            enabled: false
-        }
+            enabled: false,
+            states: {
+                hover: {
+                    enabled: false
+                }
+            }
+        },
+        stickyTracking: false,
+        tooltip: {
+            followPointer: true,
+            pointFormat: ''
+        },
+        trackByArea: true
     });
 
     /**
@@ -1889,13 +1912,28 @@ var arrayMin = Highcharts.arrayMin,
      */
     seriesTypes.polygon = extendClass(seriesTypes.scatter, {
         type: 'polygon',
-        fillGraph: true,
-        // Close all segments
-        getSegmentPath: function (segment) {
-            return Series.prototype.getSegmentPath.call(this, segment).concat('z');
+        getGraphPath: function () {
+
+            var graphPath = Series.prototype.getGraphPath.call(this),
+                i = graphPath.length + 1;
+
+            // Close all segments
+            while (i--) {
+                if (i === graphPath.length || (graphPath[i] === 'M' && i > 0)) {
+                    graphPath.splice(i, 0, 'z');
+                }
+            }
+
+            this.areaPath = graphPath;
+            return graphPath;
+        },
+        drawGraph: function () {
+            this.options.fillColor = this.color; // Hack into the fill logic in area.drawGraph
+            seriesTypes.area.prototype.drawGraph.call(this);
         },
-        drawGraph: Series.prototype.drawGraph,
-        drawLegendSymbol: Highcharts.LegendSymbolMixin.drawRectangle
+        drawLegendSymbol: Highcharts.LegendSymbolMixin.drawRectangle,
+        drawTracker: Series.prototype.drawTracker,
+        setStackedPoints: noop // No stacking points on polygons (#5310)
     });
     /* ****************************************************************************
      * Start Bubble series code                                                      *
@@ -2456,15 +2494,24 @@ var arrayMin = Highcharts.arrayMin,
          * line-like series.
          */
         wrap(seriesProto, 'getGraphPath', function (proceed, points) {
-            var series = this;
+            var series = this,
+                i,
+                firstValid;
         
             // Connect the path
             if (this.chart.polar) {
                 points = points || this.points;
 
-                if (this.options.connectEnds !== false && points[0] && points[0].y !== null) {
+                // Append first valid point in order to connect the ends
+                for (i = 0; i < points.length; i++) {
+                    if (!points[i].isNull) {
+                        firstValid = i;
+                        break;
+                    }
+                }
+                if (this.options.connectEnds !== false && firstValid !== undefined) {
                     this.connectEnds = true; // re-used in splines
-                    points.splice(points.length, 0, points[0]);
+                    points.splice(points.length, 0, points[firstValid]);
                 }
 
                 // For area charts, pseudo points are added to the graph, now we need to translate these

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

@@ -1,5 +1,5 @@
 /**
- * Highcharts JS v4.2.5 (2016-05-06)
+ * Highcharts JS v4.2.6 (2016-08-02)
  * Highcharts Broken Axis module
  * 
  * License: www.highcharts.com/license

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

@@ -2908,7 +2908,7 @@ if (CanvasRenderingContext2D) {
 		});
 	}
 }/**
- * @license Highcharts JS v4.2.5 (2016-05-06)
+ * @license Highcharts JS v4.2.6 (2016-08-02)
  * 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.5 (2016-05-06)
+ * @license Highcharts JS v4.2.6 (2016-08-02)
  * Data module
  *
  * (c) 2012-2016 Torstein Honsi
@@ -327,6 +327,16 @@
 								columns[gc - startColumn][gr - startRow] = cell.content.$t;
 							}
 						}
+
+						// Insert null for empty spreadsheet cells (#5298)
+						each(columns, function (column) {
+							for (i = 0; i < column.length; i++) {
+								if (column[i] === undefined) {
+									column[i] = null;
+								}
+							}
+						});
+
 						self.dataFound();
 					}
 				});

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

@@ -21,6 +21,7 @@
 		each = H.each,
 		extend = H.extend,
 		format = H.format,
+		merge = H.merge,
 		pick = H.pick,
 		wrap = H.wrap,
 		Chart = H.Chart,
@@ -146,11 +147,11 @@
 			last = undefined;
 		}
 		
-			
-		ddOptions = extend({
-			color: color,
-			_ddSeriesId: ddSeriesId++
-		}, ddOptions);
+		if (!ddOptions.color) {
+			ddOptions.color = color;
+		}
+		ddOptions._ddSeriesId = ddSeriesId++;
+
 		pointIndex = inArray(point, oldSeries.points);
 
 		// Record options for all current series
@@ -440,7 +441,7 @@
 					point.graphic
 						.attr(animateFrom)
 						.animate(
-							extend(point.shapeArgs, { fill: point.color }), 
+							extend(point.shapeArgs, { fill: point.color || series.color }), 
 							animationOptions
 						);
 				}
@@ -687,17 +688,23 @@
 	});
 
 	wrap(H.Series.prototype, 'drawDataLabels', function (proceed) {
-		var css = this.chart.options.drilldown.activeDataLabelStyle;
+		var series = this,
+			css = series.chart.options.drilldown.activeDataLabelStyle,
+			renderer = series.chart.renderer;
 
-		proceed.call(this);
+		proceed.call(series);
 
-		each(this.points, function (point) {
+		each(series.points, function (point) {
+			var pointCss = {};
 			if (point.drilldown && point.dataLabel) {
+				if (css.color === 'contrast') {
+					pointCss.color = renderer.getContrast(point.color || series.color);
+				}
 				point.dataLabel
 					.attr({
 						'class': 'highcharts-drilldown-data-label'
 					})
-					.css(css);
+					.css(merge(css, pointCss));
 			}
 		});
 	});

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

@@ -1,5 +1,5 @@
 /**
- * @license Highcharts JS v4.2.5 (2016-05-06)
+ * @license Highcharts JS v4.2.6 (2016-08-02)
  * Exporting module
  *
  * (c) 2010-2016 Torstein Honsi
@@ -102,10 +102,10 @@ defaultOptions.exporting = {
 	//enabled: true,
 	//filename: 'chart',
 	type: 'image/png',
-	url: 'http://export.highcharts.com/',
+	url: 'https://export.highcharts.com/',
 	//width: undefined,
 	printMaxWidth: 780,
-	//scale: 2
+	scale: 2,
 	buttons: {
 		contextButton: {
 			menuClassName: PREFIX + 'contextmenu',
@@ -409,7 +409,7 @@ extend(Chart.prototype, {
 			filename: options.filename || 'chart',
 			type: options.type,
 			width: options.width || 0, // IE8 fails to post undefined correctly, so use 0
-			scale: options.scale || 2,
+			scale: options.scale,
 			svg: svg
 		}, options.formAttributes);
 
@@ -427,7 +427,6 @@ extend(Chart.prototype, {
 			body = doc.body,
 			childNodes = body.childNodes,
 			printMaxWidth = chart.options.exporting.printMaxWidth,
-			hasUserSize,
 			resetParams,
 			handleMaxWidth;
 
@@ -443,9 +442,8 @@ extend(Chart.prototype, {
 		// Handle printMaxWidth
 		handleMaxWidth = printMaxWidth && chart.chartWidth > printMaxWidth;
 		if (handleMaxWidth) {
-			hasUserSize = chart.hasUserSize;
-			resetParams = [chart.chartWidth, chart.chartHeight, false];
-			chart.setSize(printMaxWidth, chart.chartHeight, false);
+			resetParams = [chart.options.chart.width, undefined, false];
+			chart.setSize(printMaxWidth, undefined, false);
 		}
 
 		// hide all body content
@@ -481,7 +479,6 @@ extend(Chart.prototype, {
 			// Reset printMaxWidth
 			if (handleMaxWidth) {
 				chart.setSize.apply(chart, resetParams);
-				chart.hasUserSize = hasUserSize;
 			}
 
 			fireEvent(chart, 'afterPrint');

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

@@ -109,7 +109,7 @@ seriesTypes.funnel = Highcharts.extendClass(seriesTypes.pie, {
 				neckWidth + (width - neckWidth) * (1 - (y - top) / (height - neckHeight));
 		};
 		series.getX = function (y, half) {
-			return centerX + (half ? -1 : 1) * ((getWidthAt(reversed ? plotHeight - y : y) / 2) + options.dataLabels.distance);
+			return centerX + (half ? -1 : 1) * ((getWidthAt(reversed ? 2 * centerY - y : y) / 2) + options.dataLabels.distance);
 		};
 
 		// Expose
@@ -176,9 +176,9 @@ seriesTypes.funnel = Highcharts.extendClass(seriesTypes.pie, {
 			}
 
 			if (reversed) {
-				y1 = height - y1;
-				y3 = height - y3;
-				y5 = (y5 ? height - y5 : null);
+				y1 = 2 * centerY - y1;
+				y3 = 2 * centerY - y3;
+				y5 = (y5 ? 2 * centerY - y5 : null);
 			}
 			// save the path
 			path = [

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

@@ -1,5 +1,5 @@
 /**
- * @license Highcharts JS v4.2.5 (2016-05-06)
+ * @license Highcharts JS v4.2.6 (2016-08-02)
  *
  * (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.5 (2016-05-06)
+ * @license Highcharts JS v4.2.6 (2016-08-02)
  * Plugin for displaying a message when there is no data visible in chart.
  *
  * (c) 2010-2016 Highsoft AS

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

@@ -1,5 +1,5 @@
 /**
- * @license Highcharts JS v4.2.5 (2016-05-06)
+ * @license Highcharts JS v4.2.6 (2016-08-02)
  * Client side exporting module
  *
  * (c) 2015 Torstein Honsi / Oystein Moseng
@@ -18,7 +18,10 @@
 
 	var win = Highcharts.win,
 		nav = win.navigator,
-		doc = win.document;
+		doc = win.document,
+		domurl = win.URL || win.webkitURL || win,
+		isMSBrowser = /Edge\/|Trident\/|MSIE /.test(nav.userAgent),
+		loadEventDeferDelay = isMSBrowser ? 150 : 0; // Milliseconds to defer image load event handlers to offset IE bug
 
 	// Dummy object so we can reuse our canvas-tools.js without errors
 	Highcharts.CanVGRenderer = {};
@@ -40,217 +43,216 @@
 		head.appendChild(script);
 	}
 
-	/**
-	 * 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 = nav.userAgent.indexOf('WebKit') > -1 && nav.userAgent.indexOf('Chrome') < 0, // Webkit and not chrome
-			scale = options.scale || 2,
-			chartCopyContainer,
-			domurl = win.URL || win.webkitURL || win,
-			images,
-			imagesEmbedded = 0,
-			el,
-			i,
-			l,
-			fallbackToExportServer = function () {
-				if (options.fallbackToExportServer === false) {
-					if (options.error) {
-						options.error();
-					} else {
-						throw 'Fallback to export server disabled';
-					}
-				} else {
-					chart.exportChart(options);
+	// Download contents by dataURL/blob
+	Highcharts.downloadURL = function (dataURL, filename) {
+		var a = doc.createElement('a'),
+			windowRef;
+
+		// IE specific blob implementation
+		if (nav.msSaveOrOpenBlob) {
+			nav.msSaveOrOpenBlob(dataURL, filename);
+			return;
+		}
+
+		// Try HTML5 download attr if supported
+		if (a.download !== undefined) {
+			a.href = dataURL;
+			a.download = filename; // HTML5 download attribute
+			a.target = '_blank';
+			doc.body.appendChild(a);
+			a.click();
+			doc.body.removeChild(a);
+		} else {
+			// No download attr, just opening data URI
+			try {
+				windowRef = win.open(dataURL, 'chart');
+				if (windowRef === undefined || windowRef === null) {
+					throw 'Failed to open window';
 				}
-			},
-			// 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 three arguments: imageURL, imageType, and callbackArgs. callbackArgs is used only by callbacks and can contain whatever.
-			imageToDataUrl = function (imageURL, imageType, callbackArgs, successCallback, taintedCallback, noCanvasSupportCallback, failedLoadCallback, finallyCallback) {
-				var img = new win.Image(),
-					taintedHandler,
-					loadHandler = function () {
-						var canvas = doc.createElement('canvas'),
-							ctx = canvas.getContext && canvas.getContext('2d'),
-							dataURL;
-						try {
-							if (!ctx) {
-								noCanvasSupportCallback(imageURL, imageType, callbackArgs);
-							} else {
-								canvas.height = img.height * scale;
-								canvas.width = img.width * scale;
-								ctx.drawImage(img, 0, 0, canvas.width, canvas.height);
+			} catch (e) {
+				// window.open failed, trying location.href
+				win.location.href = dataURL;
+			}
+		}
+	};
 
-								// Now we try to get the contents of the canvas.
-								try {
-									dataURL = canvas.toDataURL(imageType);
-									successCallback(dataURL, imageType, 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, imageType, callbackArgs);
-									} else {
-										throw e;
-									}
-								}
-							}
-						} finally {
-							if (finallyCallback) {
-								finallyCallback(imageURL, imageType, callbackArgs);
+	// Get blob URL from SVG code. Falls back to normal data URI.
+	Highcharts.svgToDataUrl = function (svg) {
+		var webKit = nav.userAgent.indexOf('WebKit') > -1 && nav.userAgent.indexOf('Chrome') < 0; // Webkit and not chrome
+		try {
+			// Safari requires data URI since it doesn't allow navigation to blob URLs
+			// Firefox has an issue with Blobs and internal references, leading to gradients not working using Blobs (#4550)
+			if (!webKit && nav.userAgent.toLowerCase().indexOf('firefox') < 0) {
+				return domurl.createObjectURL(new win.Blob([svg], { type: 'image/svg+xml;charset-utf-16' }));
+			}
+		} catch (e) {
+			// Ignore
+		}
+		return 'data:image/svg+xml;charset=UTF-8,' + encodeURIComponent(svg);
+	};
+
+	// 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 four arguments: imageURL, imageType, callbackArgs and scale. callbackArgs is used only by callbacks and can contain whatever.
+	Highcharts.imageToDataUrl = function (imageURL, imageType, callbackArgs, scale, successCallback, taintedCallback, noCanvasSupportCallback, failedLoadCallback, finallyCallback) {
+		var img = new win.Image(),
+			taintedHandler,
+			loadHandler = function () {
+				setTimeout(function () {
+					var canvas = doc.createElement('canvas'),
+						ctx = canvas.getContext && canvas.getContext('2d'),
+						dataURL;
+					try {
+						if (!ctx) {
+							noCanvasSupportCallback(imageURL, imageType, callbackArgs, scale);
+						} 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(imageType);
+								successCallback(dataURL, imageType, callbackArgs, scale);
+							} catch (e) {
+								taintedHandler(imageURL, imageType, callbackArgs, scale);
 							}
 						}
-					},
-					// Image load failed (e.g. invalid URL)
-					errorHandler = function () {
-						failedLoadCallback(imageURL, imageType, callbackArgs);
+					} finally {
 						if (finallyCallback) {
-							finallyCallback(imageURL, imageType, callbackArgs);
+							finallyCallback(imageURL, imageType, callbackArgs, scale);
 						}
-					};
-				
-				// 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.
-			svgToDataUrl = function (svg) {
-				try {
-					// Safari requires data URI since it doesn't allow navigation to blob URLs
-					// Firefox has an issue with Blobs and internal references, leading to gradients not working using Blobs (#4550)
-					if (!webKit && nav.userAgent.toLowerCase().indexOf('firefox') < 0) {
-						return domurl.createObjectURL(new win.Blob([svg], { type: 'image/svg+xml;charset-utf-16' }));
 					}
-				} catch (e) {
-					// Ignore
-				}
-				return 'data:image/svg+xml;charset=UTF-8,' + encodeURIComponent(svg);
+				}, loadEventDeferDelay); // IE bug where image is not always ready despite calling load event.
 			},
-			// Download contents by dataURL/blob
-			download = function (dataURL, extension) {
-				var a = doc.createElement('a'),
-					filename = (options.filename || 'chart') + '.' + extension,
-					windowRef;
-
-				// IE specific blob implementation
-				if (nav.msSaveOrOpenBlob) {
-					nav.msSaveOrOpenBlob(dataURL, filename);
-					return;
+			// Image load failed (e.g. invalid URL)
+			errorHandler = function () {
+				failedLoadCallback(imageURL, imageType, callbackArgs, scale);
+				if (finallyCallback) {
+					finallyCallback(imageURL, imageType, callbackArgs, scale);
 				}
+			};
+
+		// 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;
+	};
 
-				// Try HTML5 download attr if supported
-				if (a.download !== undefined) {
-					a.href = dataURL;
-					a.download = filename; // HTML5 download attribute
-					a.target = '_blank';
-					doc.body.appendChild(a);
-					a.click();
-					doc.body.removeChild(a);
+	// Get data URL to an image of an SVG and call download on it
+	Highcharts.downloadSVGLocal = function (svg, filename, imageType, scale, failCallback, successCallback) {
+		var svgurl,
+			blob,
+			objectURLRevoke = true,
+			finallyHandler;
+
+		// Initiate download depending on file type
+		if (imageType === 'image/svg+xml') {
+			// SVG download. In this case, we want to use Microsoft specific Blob if available
+			try {
+				if (nav.msSaveOrOpenBlob) {
+					blob = new MSBlobBuilder();
+					blob.append(svg);
+					svgurl = blob.getBlob('image/svg+xml');
 				} else {
-					// No download attr, just opening data URI
-					try {
-						windowRef = win.open(dataURL, 'chart');
-						if (windowRef === undefined || windowRef === null) {
-							throw 'Failed to open window';
-						}
-					} catch (e) {
-						// window.open failed, trying location.href
-						win.location.href = dataURL;
-					}
+					svgurl = Highcharts.svgToDataUrl(svg);
 				}
-			},
-			// Get data URL to an image of the chart and call download on it
-			initiateDownload = function () {
-				var svgurl,
-					blob,
-					imageType = options && options.type || 'image/png',
-					imageExtension = imageType.split('/')[1],
-					svg = chart.sanitizeSVG(chartCopyContainer.innerHTML); // SVG of chart copy
+				Highcharts.downloadURL(svgurl, filename);
+				if (successCallback) {
+					successCallback();
+				}
+			} catch (e) {
+				failCallback();
+			}
+		} else {
+			// PNG/JPEG download - create bitmap from SVG
 
-				// Initiate download depending on file type
-				if (imageType === 'image/svg+xml') {
-					// SVG download. In this case, we want to use Microsoft specific Blob if available
-					try {
-						if (nav.msSaveOrOpenBlob) {
-							blob = new MSBlobBuilder();
-							blob.append(svg);
-							svgurl = blob.getBlob('image/svg+xml');
-						} else {
-							svgurl = svgToDataUrl(svg);
-						}
-						download(svgurl, 'svg');
-					} catch (e) {
-						fallbackToExportServer();
+			svgurl = Highcharts.svgToDataUrl(svg);
+			finallyHandler = function () {
+				try {
+					domurl.revokeObjectURL(svgurl);
+				} catch (e) {
+					// Ignore
+				}
+			};
+			// First, try to get PNG by rendering on canvas
+			Highcharts.imageToDataUrl(svgurl, imageType, { /* args */ }, scale, function (imageURL) {
+				// Success
+				try {
+					Highcharts.downloadURL(imageURL, filename);
+					if (successCallback) {
+						successCallback();
 					}
-				} else {
-					// PNG/JPEG download - create bitmap from SVG
-					
-					// First, try to get PNG by rendering on canvas
-					svgurl = svgToDataUrl(svg);
-					imageToDataUrl(svgurl, imageType, { /* args */ }, function (imageURL) {
-						// Success
+				} catch (e) {
+					failCallback();
+				}
+			}, function () {
+				// Failed due to tainted canvas
+				// Create new and untainted canvas
+				var canvas = doc.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(imageURL, imageExtension);
+							Highcharts.downloadURL(nav.msSaveOrOpenBlob ? canvas.msToBlob() : canvas.toDataURL(imageType), filename);
+							if (successCallback) {
+								successCallback();
+							}
 						} catch (e) {
-							fallbackToExportServer();
+							failCallback();
+						} finally {
+							finallyHandler();
 						}
-					}, function () {
-						// Failed due to tainted canvas
-						// Create new and untainted canvas
-						var canvas = doc.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(nav.msSaveOrOpenBlob ? canvas.msToBlob() : canvas.toDataURL(imageType), imageExtension);
-								} catch (e) {
-									fallbackToExportServer();
-								}
-							};
+					};
 
-						canvas.width = imageWidth;
-						canvas.height = imageHeight;
-						if (win.canvg) {
-							// Use preloaded canvg
-							downloadWithCanVG();
-						} else {
-							// Must load canVG first
-							chart.showLoading();
-							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
-						}
+				canvas.width = imageWidth;
+				canvas.height = imageHeight;
+				if (win.canvg) {
+					// Use preloaded canvg
+					downloadWithCanVG();
+				} else {
+					// Must load canVG first
+					objectURLRevoke = true; // Don't destroy the object URL yet since we are doing things asynchronously. A cleaner solution would be nice, but this will do for now.
+					getScript(Highcharts.getOptions().global.canvasToolsURL, function () {
+						downloadWithCanVG();
 					});
 				}
 			},
+			// No canvas support
+			failCallback,
+			// Failed to load image
+			failCallback,
+			// Finally
+			function () {
+				if (objectURLRevoke) {
+					finallyHandler();
+				}
+			});
+		}
+	};
+
+	// Get SVG of chart prepared for client side export. This converts embedded images in the SVG to data URIs.
+	// The options and chartOptions arguments are passed to the getSVGForExport function.
+	Highcharts.Chart.prototype.getSVGForLocalExport = function (options, chartOptions, failCallback, successCallback) {
+		var chart = this,
+			images,
+			imagesEmbedded = 0,
+			chartCopyContainer,
+			el,
+			i,
+			l,
 			// Success handler, we converted image to base64!
 			embeddedSuccess = function (imageURL, imageType, callbackArgs) {
 				++imagesEmbedded;
@@ -258,9 +260,9 @@
 				// 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
+				// When done with last image we have our SVG
 				if (imagesEmbedded === images.length) {
-					initiateDownload();
+					successCallback(chart.sanitizeSVG(chartCopyContainer.innerHTML));
 				}
 			};
 
@@ -275,27 +277,61 @@
 		images = chartCopyContainer.getElementsByTagName('image');
 
 		try {
-			// If there are no images to embed, just go ahead and start the download process
+			// If there are no images to embed, the SVG is okay now.
 			if (!images.length) {
-				initiateDownload();
+				successCallback(chart.sanitizeSVG(chartCopyContainer.innerHTML)); // Use SVG of chart copy
+				return;
 			}
 
 			// 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'), 'image/png', { imageElement: el },
+				Highcharts.imageToDataUrl(el.getAttributeNS('http://www.w3.org/1999/xlink', 'href'), 'image/png', { imageElement: el }, options.scale,
 					embeddedSuccess,
 					// Tainted canvas
-					fallbackToExportServer,
-					// No canvas support 
-					fallbackToExportServer,
+					failCallback,
+					// No canvas support
+					failCallback,
 					// Failed to load source
-					fallbackToExportServer
+					failCallback
 				);
 			}
 		} catch (e) {
+			failCallback();
+		}
+	};
+
+	/**
+	 * 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),
+			imageType = options && options.type || 'image/png',
+			fallbackToExportServer = function () {
+				if (options.fallbackToExportServer === false) {
+					if (options.error) {
+						options.error();
+					} else {
+						throw 'Fallback to export server disabled';
+					}
+				} else {
+					chart.exportChart(options);
+				}
+			},
+			svgSuccess = function (svg) {
+				var filename = (options.filename || 'chart') + '.' + (imageType === 'image/svg+xml' ? 'svg' : imageType.split('/')[1]);
+				Highcharts.downloadSVGLocal(svg, filename, imageType, options.scale, fallbackToExportServer);
+			};
+
+		// If we have embedded images and are exporting to JPEG/PNG, Microsoft browsers won't handle it, so fall back
+		// docs
+		if (isMSBrowser && imageType !== 'image/svg+xml' && chart.container.getElementsByTagName('image').length) {
 			fallbackToExportServer();
+			return;
 		}
+
+		chart.getSVGForLocalExport(options, chartOptions, fallbackToExportServer, svgSuccess);
 	};
 
 	// Extend the default options to use the local exporter logic