highcharts-rails 3.0.9 → 3.0.10

data/app/assets/javascripts/highcharts/adapters/mootools-adapter.js

@@ -1,5 +1,5 @@
 /**
- * @license Highcharts JS v3.0.9 (2014-01-15)
+ * @license Highcharts JS v3.0.10 (2014-03-10)
  * MooTools adapter
  *
  * (c) 2010-2014 Torstein Honsi

data/app/assets/javascripts/highcharts/adapters/prototype-adapter.js

@@ -1,5 +1,5 @@
 /**
- * @license Highcharts JS v3.0.9 (2014-01-15)
+ * @license Highcharts JS v3.0.10 (2014-03-10)
  * Prototype adapter
  *
  * @author Michael Nelson, Torstein Honsi.

data/app/assets/javascripts/highcharts/adapters/standalone-framework.js

@@ -1,5 +1,5 @@
 /**
- * @license Highcharts JS v3.0.9 (2014-01-15)
+ * @license Highcharts JS v3.0.10 (2014-03-10)
  *
  * Standalone Highcharts Framework
  *
@@ -304,7 +304,7 @@ return {
 				// HTML styles
 				} else {
 					styles = {};
-					styles[elem] = this.now + this.unit;
+					styles[this.prop] = this.now + this.unit;
 					Highcharts.css(elem, styles);
 				}
 				
@@ -350,9 +350,10 @@ return {
 					ret,
 					done,
 					options = this.options,
+					elem = this.elem,
 					i;
-
-				if (this.elem.stopAnimation) {
+				
+				if (elem.stopAnimation || (elem.attr && !elem.element)) { // #2616, element including flag is destroyed
 					ret = false;
 
 				} else if (gotoEnd || t >= options.duration + this.startTime) {
@@ -371,7 +372,7 @@ return {
 
 					if (done) {
 						if (options.complete) {
-							options.complete.call(this.elem);
+							options.complete.call(elem);
 						}
 					}
 					ret = false;
@@ -504,19 +505,16 @@ return {
 		return results;
 	},
 
+	/**
+	 * Get the element's offset position, corrected by overflow:auto. Loosely based on jQuery's offset method.
+	 */
 	offset: function (el) {
-		var left = 0,
-			top = 0;
-
-		while (el) {
-			left += el.offsetLeft;
-			top += el.offsetTop;
-			el = el.offsetParent;
-		}
+		var docElem = document.documentElement,
+			box = el.getBoundingClientRect();
 
 		return {
-			left: left,
-			top: top
+			top: box.top  + (window.pageYOffset || docElem.scrollTop)  - (docElem.clientTop  || 0),
+			left: box.left + (window.pageXOffset || docElem.scrollLeft) - (docElem.clientLeft || 0)
 		};
 	},
 

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

@@ -2,7 +2,7 @@
 // @compilation_level SIMPLE_OPTIMIZATIONS
 
 /**
- * @license Highcharts JS v3.0.9 (2014-01-15)
+ * @license Highcharts JS v3.0.10 (2014-03-10)
  *
  * (c) 2009-2014 Torstein Honsi
  *
@@ -155,7 +155,6 @@ var radialAxisMixin = {
 		minorTickLength: 10,
 		minorTickPosition: 'inside',
 		minorTickWidth: 1,
-		plotBands: [],
 		tickLength: 10,
 		tickPosition: 'inside',
 		tickWidth: 2,
@@ -176,7 +175,6 @@ var radialAxisMixin = {
 		},
 		maxPadding: 0,
 		minPadding: 0,
-		plotBands: [],
 		showLastLabel: false, 
 		tickLength: 0
 	},
@@ -189,7 +187,6 @@ var radialAxisMixin = {
 			x: -3,
 			y: -2
 		},
-		plotBands: [],
 		showLastLabel: false,
 		title: {
 			x: 4,
@@ -203,11 +200,16 @@ var radialAxisMixin = {
 	 */
 	setOptions: function (userOptions) {
 		
-		this.options = merge(
+		var options = this.options = merge(
 			this.defaultOptions,
 			this.defaultRadialOptions,
 			userOptions
 		);
+
+		// Make sure the plotBands array is instanciated for each Axis (#2649)
+		if (!options.plotBands) {
+			options.plotBands = [];
+		}
 		
 	},
 	
@@ -272,8 +274,7 @@ var radialAxisMixin = {
 			}
 			
 			if (this.isXAxis) {
-				this.minPixelPadding = this.transA * this.minPointOffset +
-					(this.reversed ? (this.endAngleRad - this.startAngleRad) / 4 : 0); // ???
+				this.minPixelPadding = this.transA * this.minPointOffset;
 			} else {
 				// This is a workaround for regression #2593, but categories still don't position correctly.
 				// TODO: Implement true handling of Y axis categories on gauges.
@@ -304,10 +305,16 @@ var radialAxisMixin = {
 
 			// Set the center array
 			this.center = this.pane.center = Highcharts.CenteredSeriesMixin.getCenter.call(this.pane);
+
+			// The sector is used in Axis.translate to compute the translation of reversed axis points (#2570)
+			if (this.isCircular) {
+				this.sector = this.endAngleRad - this.startAngleRad;	
+			}
 			
-			this.len = this.width = this.height = this.isCircular ?
-				this.center[2] * (this.endAngleRad - this.startAngleRad) / 2 :
-				this.center[2] / 2;
+			// Axis len is used to lay out the ticks
+			this.len = this.width = this.height = this.center[2] * pick(this.sector, 1) / 2;
+
+
 		}
 	},
 	
@@ -795,6 +802,7 @@ seriesTypes.arearange = extendClass(seriesTypes.area, {
 				
 				// Set preliminary values
 				point.y = point.high;
+				point._plotY = point.plotY;
 				point.plotY = point.plotHigh;
 				
 				// Store original data labels and set preliminary label objects to be picked up 
@@ -827,7 +835,7 @@ seriesTypes.arearange = extendClass(seriesTypes.area, {
 				
 				// Reset values
 				point.y = point.low;
-				point.plotY = point.plotLow;
+				point.plotY = point._plotY;
 				
 				// Set the default offset
 				point.below = true;
@@ -1020,12 +1028,18 @@ var GaugeSeries = {
 				rearLength = (pInt(pick(dialOptions.rearLength, 10)) * radius) / 100,
 				baseWidth = dialOptions.baseWidth || 3,
 				topWidth = dialOptions.topWidth || 1,
+				overshoot = options.overshoot,
 				rotation = yAxis.startAngleRad + yAxis.translate(point.y, null, null, null, true);
 
-			// Handle the wrap option
-			if (options.wrap === false) {
+			// Handle the wrap and overshoot options
+			if (overshoot && typeof overshoot === 'number') {
+				overshoot = overshoot / 180 * Math.PI;
+				rotation = Math.max(yAxis.startAngleRad - overshoot, Math.min(yAxis.endAngleRad + overshoot, rotation));			
+			
+			} else if (options.wrap === false) {
 				rotation = Math.max(yAxis.startAngleRad, Math.min(yAxis.endAngleRad, rotation));
 			}
+
 			rotation = rotation * 180 / Math.PI;
 				
 			point.shapeType = 'path';
@@ -1457,6 +1471,7 @@ seriesTypes.errorbar = extendClass(seriesTypes.boxplot, {
 	},
 	pointValKey: 'high', // defines the top of the tracker
 	doQuartiles: false,
+	drawDataLabels: seriesTypes.arearange ? seriesTypes.arearange.prototype.drawDataLabels : noop,
 
 	/**
 	 * Get the width and X offset, either on top of the linked series column
@@ -1947,7 +1962,7 @@ Axis.prototype.beforePadding = function () {
 			var seriesOptions = series.options,
 				zData;
 
-			if (series.bubblePadding && series.visible) {
+			if (series.bubblePadding && (series.visible || !chart.options.chart.ignoreHiddenSeries)) {
 
 				// Correction for #1673
 				axis.allowZoomOutside = true;
@@ -2040,14 +2055,20 @@ Axis.prototype.beforePadding = function () {
 		var xy,
 			chart = this.chart,
 			plotX = point.plotX,
-			plotY = point.plotY;
+			plotY = point.plotY,
+			clientX;
 	
 		// Save rectangular plotX, plotY for later computation
 		point.rectPlotX = plotX;
 		point.rectPlotY = plotY;
 	
 		// Record the angle in degrees for use in tooltip
-		point.clientX = ((plotX / Math.PI * 180) + this.xAxis.pane.options.startAngle) % 360;
+		clientX = ((plotX / Math.PI * 180) + this.xAxis.pane.options.startAngle) % 360;
+		if (clientX < 0) { // #2665
+			clientX += 360;
+		}
+		point.clientX = clientX;
+
 	
 		// Find the polar plotX and plotY
 		xy = this.xAxis.postTranslate(point.plotX, this.yAxis.len - plotY);
@@ -2330,7 +2351,6 @@ Axis.prototype.beforePadding = function () {
 				tooltipLen: 360 // degrees are the resolution unit of the tooltipPoints array
 			});	
 		}
-	
 		// Run uber method
 		return proceed.call(this, renew);
 	});

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

@@ -2908,7 +2908,7 @@ if (CanvasRenderingContext2D) {
 		});
 	}
 }/**
- * @license Highcharts JS v3.0.9 (2014-01-15)
+ * @license Highcharts JS v3.0.10 (2014-03-10)
  * CanVGRenderer Extension module
  *
  * (c) 2011-2012 Torstein Honsi, Erik Olsson

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

@@ -232,9 +232,8 @@
 			startRow = options.startRow || 0,
 			endRow = options.endRow || Number.MAX_VALUE,
 			startColumn = options.startColumn || 0,
-			endColumn = options.endColumn || Number.MAX_VALUE,
-			colNo;
-			
+			endColumn = options.endColumn || Number.MAX_VALUE;
+
 		if (table) {
 			
 			if (typeof table === 'string') {
@@ -242,16 +241,14 @@
 			}
 			
 			each(table.getElementsByTagName('tr'), function (tr, rowNo) {
-				colNo = 0; 
 				if (rowNo >= startRow && rowNo <= endRow) {
-					each(tr.childNodes, function (item) {
+					each(tr.children, function (item, colNo) {
 						if ((item.tagName === 'TD' || item.tagName === 'TH') && colNo >= startColumn && colNo <= endColumn) {
-							if (!columns[colNo]) {
-								columns[colNo] = [];					
+							if (!columns[colNo - startColumn]) {
+								columns[colNo - startColumn] = [];					
 							}
-							columns[colNo][rowNo - startRow] = item.innerHTML;
 							
-							colNo += 1;
+							columns[colNo - startColumn][rowNo - startRow] = item.innerHTML;
 						}
 					});
 				}
@@ -276,53 +273,56 @@
 			gc; // google column
 
 		if (googleSpreadsheetKey) {
-			jQuery.getJSON('https://spreadsheets.google.com/feeds/cells/' + 
+			jQuery.ajax({
+				dataType: 'json', 
+				url: 'https://spreadsheets.google.com/feeds/cells/' + 
 				  googleSpreadsheetKey + '/' + (options.googleSpreadsheetWorksheet || 'od6') +
 					  '/public/values?alt=json-in-script&callback=?',
-					  function (json) {
-					
-				// Prepare the data from the spreadsheat
-				var cells = json.feed.entry,
-					cell,
-					cellCount = cells.length,
-					colCount = 0,
-					rowCount = 0,
-					i;
-			
-				// First, find the total number of columns and rows that 
-				// are actually filled with data
-				for (i = 0; i < cellCount; i++) {
-					cell = cells[i];
-					colCount = Math.max(colCount, cell.gs$cell.col);
-					rowCount = Math.max(rowCount, cell.gs$cell.row);			
-				}
-			
-				// Set up arrays containing the column data
-				for (i = 0; i < colCount; i++) {
-					if (i >= startColumn && i <= endColumn) {
-						// Create new columns with the length of either end-start or rowCount
-						columns[i - startColumn] = [];
-
-						// Setting the length to avoid jslint warning
-						columns[i - startColumn].length = Math.min(rowCount, endRow - startRow);
+				error: options.error,
+				success: function (json) {
+					// Prepare the data from the spreadsheat
+					var cells = json.feed.entry,
+						cell,
+						cellCount = cells.length,
+						colCount = 0,
+						rowCount = 0,
+						i;
+				
+					// First, find the total number of columns and rows that 
+					// are actually filled with data
+					for (i = 0; i < cellCount; i++) {
+						cell = cells[i];
+						colCount = Math.max(colCount, cell.gs$cell.col);
+						rowCount = Math.max(rowCount, cell.gs$cell.row);			
 					}
-				}
 				
-				// Loop over the cells and assign the value to the right
-				// place in the column arrays
-				for (i = 0; i < cellCount; i++) {
-					cell = cells[i];
-					gr = cell.gs$cell.row - 1; // rows start at 1
-					gc = cell.gs$cell.col - 1; // columns start at 1
-
-					// If both row and col falls inside start and end
-					// set the transposed cell value in the newly created columns
-					if (gc >= startColumn && gc <= endColumn &&
-						gr >= startRow && gr <= endRow) {
-						columns[gc - startColumn][gr - startRow] = cell.content.$t;
+					// Set up arrays containing the column data
+					for (i = 0; i < colCount; i++) {
+						if (i >= startColumn && i <= endColumn) {
+							// Create new columns with the length of either end-start or rowCount
+							columns[i - startColumn] = [];
+
+							// Setting the length to avoid jslint warning
+							columns[i - startColumn].length = Math.min(rowCount, endRow - startRow);
+						}
 					}
+					
+					// Loop over the cells and assign the value to the right
+					// place in the column arrays
+					for (i = 0; i < cellCount; i++) {
+						cell = cells[i];
+						gr = cell.gs$cell.row - 1; // rows start at 1
+						gc = cell.gs$cell.col - 1; // columns start at 1
+
+						// If both row and col falls inside start and end
+						// set the transposed cell value in the newly created columns
+						if (gc >= startColumn && gc <= endColumn &&
+							gr >= startRow && gr <= endRow) {
+							columns[gc - startColumn][gr - startRow] = cell.content.$t;
+						}
+					}
+					self.dataFound();
 				}
-				self.dataFound();
 			});
 		}
 	},
@@ -523,22 +523,27 @@
 				
 				// Iterate down the cells of each column and add data to the series
 				data = [];
-				for (j = 0; j < columns[i].length; j++) {
-					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);
+
+				// Only loop and fill the data series if there are columns available.
+				// We need this check to avoid reading outside the array bounds.
+				if (i + valueCount <= columns.length) {
+					for (j = 0; j < columns[i].length; j++) {
+						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);
+						}
 					}
 				}
 

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

@@ -16,6 +16,7 @@
 		defaultOptions = H.getOptions(),
 		each = H.each,
 		extend = H.extend,
+		format = H.format,
 		wrap = H.wrap,
 		Chart = H.Chart,
 		seriesTypes = H.seriesTypes,
@@ -73,7 +74,7 @@
 		this
 		.attr({
 			opacity: 0.1,
-			visibility: 'visible'
+			visibility: 'inherit'
 		})
 		.animate({
 			opacity: 1
@@ -82,29 +83,48 @@
 		});
 	};
 
-	// Extend the Chart prototype
-	Chart.prototype.drilldownLevels = [];
-
 	Chart.prototype.addSeriesAsDrilldown = function (point, ddOptions) {
+		this.addSingleSeriesAsDrilldown(point, ddOptions);
+		this.applyDrilldown();
+	};
+	Chart.prototype.addSingleSeriesAsDrilldown = function (point, ddOptions) {
 		var oldSeries = point.series,
 			xAxis = oldSeries.xAxis,
 			yAxis = oldSeries.yAxis,
 			newSeries,
 			color = point.color || oldSeries.color,
 			pointIndex,
-			level;
+			levelSeries = [],
+			levelSeriesOptions = [],
+			level,
+			levelNumber;
+
+		levelNumber = oldSeries.levelNumber || 0;
 			
 		ddOptions = extend({
 			color: color
 		}, ddOptions);
 		pointIndex = inArray(point, oldSeries.points);
+
+		// Record options for all current series
+		each(oldSeries.chart.series, function (series) {
+			if (series.xAxis === xAxis && series.yAxis === yAxis) {
+				levelSeries.push(series);
+				levelSeriesOptions.push(series.userOptions);
+				series.levelNumber = series.levelNumber || 0;
+			}
+		});
 		
+		// Add a record of properties for each drilldown level
 		level = {
+			levelNumber: levelNumber,
 			seriesOptions: oldSeries.userOptions,
+			levelSeriesOptions: levelSeriesOptions,
+			levelSeries: levelSeries,
 			shapeArgs: point.shapeArgs,
 			bBox: point.graphic.getBBox(),
 			color: color,
-			newSeries: ddOptions,
+			lowerSeriesOptions: ddOptions,
 			pointOptions: oldSeries.options.data[pointIndex],
 			pointIndex: pointIndex,
 			oldExtremes: {
@@ -115,9 +135,14 @@
 			}
 		};
 
+		// Generate and push it to a lookup array
+		if (!this.drilldownLevels) {
+			this.drilldownLevels = [];
+		}
 		this.drilldownLevels.push(level);
 
-		newSeries = this.addSeries(ddOptions, false);
+		newSeries = level.lowerSeries = this.addSeries(ddOptions, false);
+		newSeries.levelNumber = levelNumber + 1;
 		if (xAxis) {
 			xAxis.oldPos = xAxis.pos;
 			xAxis.userMin = xAxis.userMax = null;
@@ -129,8 +154,21 @@
 			newSeries.animate = newSeries.animateDrilldown || noop;
 			newSeries.options.animation = true;
 		}
+	};
+
+	Chart.prototype.applyDrilldown = function () {
+		var drilldownLevels = this.drilldownLevels, 
+			levelToRemove = drilldownLevels[drilldownLevels.length - 1].levelNumber;
 		
-		oldSeries.remove(false);
+		each(this.drilldownLevels, function (level) {
+			if (level.levelNumber === levelToRemove) {
+				each(level.levelSeries, function (series) {
+					if (series.levelNumber === levelToRemove) { // Not removed, not added as part of a multi-series drilldown
+						series.remove(false);
+					}
+				});
+			}
+		});
 		
 		this.redraw();
 		this.showDrillUpButton();
@@ -138,8 +176,8 @@
 
 	Chart.prototype.getDrilldownBackText = function () {
 		var lastLevel = this.drilldownLevels[this.drilldownLevels.length - 1];
-
-		return this.options.lang.drillUpText.replace('{series.name}', lastLevel.seriesOptions.name);
+		lastLevel.series = lastLevel.seriesOptions;
+		return format(this.options.lang.drillUpText, lastLevel);
 
 	};
 
@@ -182,32 +220,62 @@
 
 	Chart.prototype.drillUp = function () {
 		var chart = this,
-			level = chart.drilldownLevels.pop(),
-			oldSeries = chart.series[0],
-			oldExtremes = level.oldExtremes,
-			newSeries = chart.addSeries(level.seriesOptions, false);
+			drilldownLevels = chart.drilldownLevels,
+			levelNumber = drilldownLevels[drilldownLevels.length - 1].levelNumber,
+			i = drilldownLevels.length,
+			level,
+			oldSeries,
+			newSeries,
+			oldExtremes,
+			addSeries = function (seriesOptions) {
+				var addedSeries;
+				each(chart.series, function (series) {
+					if (series.userOptions === seriesOptions) {
+						addedSeries = series;
+					}
+				});
+
+				addedSeries = addedSeries || chart.addSeries(seriesOptions, false);
+				if (addedSeries.type === oldSeries.type && addedSeries.animateDrillupTo) {
+					addedSeries.animate = addedSeries.animateDrillupTo;
+				}
+				if (seriesOptions === level.seriesOptions) {
+					newSeries = addedSeries;
+				}
+			};
 		
-		fireEvent(chart, 'drillup', { seriesOptions: level.seriesOptions });
+		while (i--) {
 
-		if (newSeries.type === oldSeries.type) {
-			newSeries.drilldownLevel = level;
-			newSeries.animate = newSeries.animateDrillupTo || noop;
-			newSeries.options.animation = true;
+			level = drilldownLevels[i];
+			if (level.levelNumber === levelNumber) {
+				drilldownLevels.pop();
+				
+				oldSeries = level.lowerSeries;
 
-			if (oldSeries.animateDrillupFrom) {
-				oldSeries.animateDrillupFrom(level);
-			}
-		}
+				each(level.levelSeriesOptions, addSeries);
+				
+				fireEvent(chart, 'drillup', { seriesOptions: level.seriesOptions });
 
-		oldSeries.remove(false);
+				if (newSeries.type === oldSeries.type) {
+					newSeries.drilldownLevel = level;
+					newSeries.options.animation = true;
 
-		// Reset the zoom level of the upper series
-		if (newSeries.xAxis) {
-			newSeries.xAxis.setExtremes(oldExtremes.xMin, oldExtremes.xMax, false);
-			newSeries.yAxis.setExtremes(oldExtremes.yMin, oldExtremes.yMax, false);
+					if (oldSeries.animateDrillupFrom) {
+						oldSeries.animateDrillupFrom(level);
+					}
+				}
+				
+				oldSeries.remove(false);
+
+				// Reset the zoom level of the upper series
+				if (newSeries.xAxis) {
+					oldExtremes = level.oldExtremes;
+					newSeries.xAxis.setExtremes(oldExtremes.xMin, oldExtremes.xMax, false);
+					newSeries.yAxis.setExtremes(oldExtremes.yMin, oldExtremes.yMax, false);
+				}
+			}
 		}
 
-
 		this.redraw();
 
 		if (this.drilldownLevels.length === 0) {
@@ -220,46 +288,14 @@
 		}
 	};
 
-	PieSeries.prototype.animateDrilldown = function (init) {
-		var level = this.chart.drilldownLevels[this.chart.drilldownLevels.length - 1],
-			animationOptions = this.chart.options.drilldown.animation,
-			animateFrom = level.shapeArgs,
-			start = animateFrom.start,
-			angle = animateFrom.end - start,
-			startAngle = angle / this.points.length,
-			startColor = H.Color(level.color).rgba;
-
-		if (!init) {
-			each(this.points, function (point, i) {
-				var endColor = H.Color(point.color).rgba;
-
-				/*jslint unparam: true*/
-				point.graphic
-					.attr(H.merge(animateFrom, {
-						start: start + i * startAngle,
-						end: start + (i + 1) * startAngle
-					}))
-					.animate(point.shapeArgs, H.merge(animationOptions, {
-						step: function (val, fx) {
-							if (fx.prop === 'start') {
-								this.attr({
-									fill: tweenColors(startColor, endColor, fx.pos)
-								});
-							}
-						}
-					}));
-				/*jslint unparam: false*/
-			});
-		}
-	};
-
 
+	ColumnSeries.prototype.supportsDrilldown = true;
+	
 	/**
 	 * When drilling up, keep the upper series invisible until the lower series has
 	 * moved into place
 	 */
-	PieSeries.prototype.animateDrillupTo = 
-			ColumnSeries.prototype.animateDrillupTo = function (init) {
+	ColumnSeries.prototype.animateDrillupTo = function (init) {
 		if (!init) {
 			var newSeries = this,
 				level = newSeries.drilldownLevel;
@@ -279,13 +315,14 @@
 			setTimeout(function () {
 				each(newSeries.points, function (point, i) {  
 					// Fade in other points			  
-					var verb = i === level.pointIndex ? 'show' : 'fadeIn';
-					point.graphic[verb]();
+					var verb = i === (level && level.pointIndex) ? 'show' : 'fadeIn',
+						inherit = verb === 'show' ? true : undefined;
+					point.graphic[verb](inherit);
 					if (point.dataLabel) {
-						point.dataLabel[verb]();
+						point.dataLabel[verb](inherit);
 					}
 					if (point.connector) {
-						point.connector[verb]();
+						point.connector[verb](inherit);
 					}
 				});
 			}, Math.max(this.chart.options.drilldown.animation.duration - 50, 0));
@@ -297,21 +334,31 @@
 	};
 	
 	ColumnSeries.prototype.animateDrilldown = function (init) {
-		var animateFrom = this.chart.drilldownLevels[this.chart.drilldownLevels.length - 1].shapeArgs,
+		var series = this,
+			drilldownLevels = this.chart.drilldownLevels,
+			animateFrom = this.chart.drilldownLevels[this.chart.drilldownLevels.length - 1].shapeArgs,
 			animationOptions = this.chart.options.drilldown.animation;
 			
 		if (!init) {
+			each(drilldownLevels, function (level) {
+				if (series.userOptions === level.lowerSeriesOptions) {
+					animateFrom = level.shapeArgs;
+				}
+			});
 
 			animateFrom.x += (this.xAxis.oldPos - this.xAxis.pos);
 	
 			each(this.points, function (point) {
-				point.graphic
-					.attr(animateFrom)
-					.animate(point.shapeArgs, animationOptions);
+				if (point.graphic) {
+					point.graphic
+						.attr(animateFrom)
+						.animate(point.shapeArgs, animationOptions);
+				}
 				if (point.dataLabel) {
 					point.dataLabel.fadeIn(animationOptions);
 				}
 			});
+			this.animate = null;
 		}
 		
 	};
@@ -320,9 +367,7 @@
 	 * When drilling up, pull out the individual point graphics from the lower series
 	 * and animate them into the origin point in the upper series.
 	 */
-	ColumnSeries.prototype.animateDrillupFrom = 
-		PieSeries.prototype.animateDrillupFrom =
-	function (level) {
+	ColumnSeries.prototype.animateDrillupFrom = function (level) {
 		var animationOptions = this.chart.options.drilldown.animation,
 			group = this.group;
 
@@ -331,30 +376,75 @@
 			var graphic = point.graphic,
 				startColor = H.Color(point.color).rgba;
 
-			delete point.graphic;
+			if (graphic) {
+			
+				delete point.graphic;
 
-			/*jslint unparam: true*/
-			graphic.animate(level.shapeArgs, H.merge(animationOptions, {
+				/*jslint unparam: true*/
+				graphic.animate(level.shapeArgs, H.merge(animationOptions, {
 
-				step: function (val, fx) {
-					if (fx.prop === 'start') {
-						this.attr({
-							fill: tweenColors(startColor, H.Color(level.color).rgba, fx.pos)
-						});
-					}
-				},
-				complete: function () {
-					graphic.destroy();
-					if (group) {
-						group = group.destroy();
+					step: function (val, fx) {
+						if (fx.prop === 'start') {
+							this.attr({
+								fill: tweenColors(startColor, H.Color(level.color).rgba, fx.pos)
+							});
+						}
+					},
+					complete: function () {
+						graphic.destroy();
+						if (group) {
+							group = group.destroy();
+						}
 					}
-				}
-			}));
-			/*jslint unparam: false*/
+				}));
+				/*jslint unparam: false*/
+			}
 		});
 	};
+
+	if (PieSeries) {
+		extend(PieSeries.prototype, {
+			supportsDrilldown: true,
+			animateDrillupTo: ColumnSeries.prototype.animateDrillupTo,
+			animateDrillupFrom: ColumnSeries.prototype.animateDrillupFrom,
+
+			animateDrilldown: function (init) {
+				var level = this.chart.drilldownLevels[this.chart.drilldownLevels.length - 1],
+					animationOptions = this.chart.options.drilldown.animation,
+					animateFrom = level.shapeArgs,
+					start = animateFrom.start,
+					angle = animateFrom.end - start,
+					startAngle = angle / this.points.length,
+					startColor = H.Color(level.color).rgba;
+
+				if (!init) {
+					each(this.points, function (point, i) {
+						var endColor = H.Color(point.color).rgba;
+
+						/*jslint unparam: true*/
+						point.graphic
+							.attr(H.merge(animateFrom, {
+								start: start + i * startAngle,
+								end: start + (i + 1) * startAngle
+							}))
+							.animate(point.shapeArgs, H.merge(animationOptions, {
+								step: function (val, fx) {
+									if (fx.prop === 'start') {
+										this.attr({
+											fill: tweenColors(startColor, endColor, fx.pos)
+										});
+									}
+								}
+							}));
+						/*jslint unparam: false*/
+					});
+					this.animate = null;
+				}
+			}
+		});
+	}
 	
-	H.Point.prototype.doDrilldown = function () {
+	H.Point.prototype.doDrilldown = function (_holdRedraw) {
 		var series = this.series,
 			chart = series.chart,
 			drilldown = chart.options.drilldown,
@@ -375,7 +465,11 @@
 		});
 		
 		if (seriesOptions) {
-			chart.addSeriesAsDrilldown(this, seriesOptions);
+			if (_holdRedraw) {
+				chart.addSingleSeriesAsDrilldown(this, seriesOptions);
+			} else {
+				chart.addSeriesAsDrilldown(this, seriesOptions);
+			}
 		}
 
 	};
@@ -402,10 +496,17 @@
 					.addClass('highcharts-drilldown-axis-label')
 					.css(chart.options.drilldown.activeAxisLabelStyle)
 					.on('click', function () {
-						if (point.doDrilldown) {
-							point.doDrilldown();
-						}
+						each(tickLabel.ddPoints, function (point) {
+							if (point.doDrilldown) {
+								point.doDrilldown(true);
+							}
+						});
+						chart.applyDrilldown();
 					});
+				if (!tickLabel.ddPoints) {
+					tickLabel.ddPoints = [];
+				}
+				tickLabel.ddPoints.push(point);
 					
 			}
 		} else if (tickLabel && tickLabel._basicStyle) {
@@ -435,8 +536,6 @@
 	});
 
 	// Mark the trackers with a pointer 
-	ColumnSeries.prototype.supportsDrilldown = true;
-	PieSeries.prototype.supportsDrilldown = true;
 	var type, 
 		drawTrackerWrapper = function (proceed) {
 			proceed.call(this);