highcharts 6.1.1 → 6.2.0

package/js/modules/grid-axis.src.js

@@ -1,5 +1,5 @@
 /**
- * @license Highcharts JS v6.1.1 (2018-06-27)
+ * @license Highcharts JS v6.2.0 (2018-10-17)
  * GridAxis
  *
  * (c) 2016 Lars A. V. Cabrera
@@ -12,6 +12,10 @@
 (function (factory) {
 	if (typeof module === 'object' && module.exports) {
 		module.exports = factory;
+	} else if (typeof define === 'function' && define.amd) {
+		define(function () {
+			return factory;
+		});
 	} else {
 		factory(Highcharts);
 	}
@@ -24,14 +28,78 @@
 		* License: www.highcharts.com/license
 		*/
 
-		var each = H.each,
-		    isObject = H.isObject,
+		var argsToArray = function (args) {
+		        return Array.prototype.slice.call(args, 1);
+		    },
+		    dateFormat = H.dateFormat,
+		    defined = H.defined,
+		    each = H.each,
+		    isArray = H.isArray,
+		    isNumber = H.isNumber,
+		    isObject = function (x) {
+		        // Always use strict mode
+		        return H.isObject(x, true);
+		    },
+		    merge = H.merge,
 		    pick = H.pick,
 		    wrap = H.wrap,
 		    Axis = H.Axis,
-		    Chart = H.Chart,
 		    Tick = H.Tick;
 
+		/**
+		 * Set grid options for the axis labels. Requires Highcharts Gantt.
+		 *
+		 * @type      {object}
+		 * @since     6.2.0
+		 * @product   gantt
+		 * @apioption xAxis.grid
+		 */
+
+		/**
+		 * Enable grid on the axis labels. Defaults to true for Gantt charts.
+		 *
+		 * @type      {boolean}
+		 * @since     6.2.0
+		 * @default   true
+		 * @product   gantt
+		 * @apioption xAxis.grid.enabled
+		 */
+
+		/**
+		 * Set specific options for each column (or row for horizontal axes) in the
+		 * grid. Each extra column/row is its own axis, and the axis options can be set
+		 * here.
+		 *
+		 * @type      {Array<object>}
+		 * @sample    gantt/demo/left-axis-table
+		 *            Left axis as a table
+		 * @apioption xAxis.grid.columns
+		 */
+
+		/**
+		 * Set border color for the label grid lines.
+		 *
+		 * @type      {Highcharts.ColorString}
+		 * @apioption xAxis.grid.borderColor
+		 */
+
+		/**
+		 * Set border width of the label grid lines.
+		 *
+		 * @type      {number}
+		 * @default 1
+		 * @apioption xAxis.grid.borderWidth
+		 */
+
+		/**
+		 * Set cell height for grid axis labels. By default this is calculated from font
+		 * size.
+		 *
+		 * @type      {number}
+		 * @default null
+		 * @apioption xAxis.grid.cellHeight
+		 */
+
 
 		// Enum for which side the axis is on.
 		// Maps to axis.side
@@ -46,6 +114,14 @@
 		    3: 'left'
 		};
 
+		/**
+		 * Checks if an axis is a navigator axis.
+		 * @return {Boolean} true if axis is found in axis.chart.navigator
+		 */
+		Axis.prototype.isNavigatorAxis = function () {
+		    return /highcharts-navigator-[xy]axis/.test(this.options.className);
+		};
+
 		/**
 		 * Checks if an axis is the outer axis in its dimension. Since
 		 * axes are placed outwards in order, the axis with the highest
@@ -60,11 +136,12 @@
 		 */
 		Axis.prototype.isOuterAxis = function () {
 		    var axis = this,
+		        chart = axis.chart,
 		        thisIndex = -1,
 		        isOuter = true;
 
-		    each(this.chart.axes, function (otherAxis, index) {
-		        if (otherAxis.side === axis.side) {
+		    each(chart.axes, function (otherAxis, index) {
+		        if (otherAxis.side === axis.side && !otherAxis.isNavigatorAxis()) {
 		            if (otherAxis === axis) {
 		                // Get the index of the axis in question
 		                thisIndex = index;
@@ -73,9 +150,8 @@
 		                // not been found yet
 		            } else if (thisIndex >= 0 && index > thisIndex) {
 		                // There was an axis on the same side with a
-		                // higher index. Exit the loop.
+		                // higher index.
 		                isOuter = false;
-		                return;
 		            }
 		        }
 		    });
@@ -85,97 +161,37 @@
 		};
 
 		/**
-		 * Shortcut function to Tick.label.getBBox().width.
-		 *
-		 * @return {number} width - the width of the tick label
+		 * Get the largest label width and height.
+		 * @param {object} ticks All the ticks on one axis.
+		 * @param {array} tickPositions All the tick positions on one axis.
+		 * @return {object} object containing the properties height and width.
 		 */
-		Tick.prototype.getLabelWidth = function () {
-		    return this.label.getBBox().width;
-		};
-
-		/**
-		 * Get the maximum label length.
-		 * This function can be used in states where the axis.maxLabelLength has not
-		 * been set.
-		 *
-		 * @param  {boolean} force - Optional parameter to force a new calculation, even
-		 *                           if a value has already been set
-		 * @return {number} maxLabelLength - the maximum label length of the axis
-		 */
-		Axis.prototype.getMaxLabelLength = function (force) {
-		    var tickPositions = this.tickPositions,
-		        ticks = this.ticks,
-		        maxLabelLength = 0;
-
-		    if (!this.maxLabelLength || force) {
-		        each(tickPositions, function (tick) {
-		            tick = ticks[tick];
-		            if (tick && tick.labelLength > maxLabelLength) {
-		                maxLabelLength = tick.labelLength;
-		            }
-		        });
-		        this.maxLabelLength = maxLabelLength;
-		    }
-		    return this.maxLabelLength;
-		};
-
-		/**
-		 * Adds the axis defined in axis.options.title
-		 */
-		Axis.prototype.addTitle = function () {
-		    var axis = this,
-		        renderer = axis.chart.renderer,
-		        axisParent = axis.axisParent,
-		        horiz = axis.horiz,
-		        opposite = axis.opposite,
-		        options = axis.options,
-		        axisTitleOptions = options.title,
-		        hasData,
-		        showAxis,
-		        textAlign;
-
-		    // For reuse in Axis.render
-		    hasData = axis.hasData();
-		    axis.showAxis = showAxis = hasData || pick(options.showEmpty, true);
-
-		    // Disregard title generation in original Axis.getOffset()
-		    options.title = '';
-
-		    if (!axis.axisTitle) {
-		        textAlign = axisTitleOptions.textAlign;
-		        if (!textAlign) {
-		            textAlign = (horiz ? {
-		                low: 'left',
-		                middle: 'center',
-		                high: 'right'
-		            } : {
-		                low: opposite ? 'right' : 'left',
-		                middle: 'center',
-		                high: opposite ? 'left' : 'right'
-		            })[axisTitleOptions.align];
+		Axis.prototype.getMaxLabelDimensions = function (ticks, tickPositions) {
+		    var dimensions = {
+		        width: 0,
+		        height: 0
+		    };
+
+		    each(tickPositions, function (pos) {
+		        var tick = ticks[pos],
+		            tickHeight = 0,
+		            tickWidth = 0,
+		            label;
+
+		        if (isObject(tick)) {
+		            label = isObject(tick.label) ? tick.label : {};
+
+		            // Find width and height of tick
+		            tickHeight = label.getBBox ? label.getBBox().height : 0;
+		            tickWidth = isNumber(label.textPxLength) ? label.textPxLength : 0;
+
+		            // Update the result if width and/or height are larger
+		            dimensions.height = Math.max(tickHeight, dimensions.height);
+		            dimensions.width = Math.max(tickWidth, dimensions.width);
 		        }
-		        axis.axisTitle = renderer.text(
-		            axisTitleOptions.text,
-		            0,
-		            0,
-		            axisTitleOptions.useHTML
-		        )
-		        .attr({
-		            zIndex: 7,
-		            rotation: axisTitleOptions.rotation || 0,
-		            align: textAlign
-		        })
-		        .addClass('highcharts-axis-title')
-        
-		        // Add to axisParent instead of axisGroup, to ignore the space
-		        // it takes
-		        .add(axisParent);
-		        axis.axisTitle.isNew = true;
-		    }
-
+		    });
 
-		    // hide or show the title depending on whether showEmpty is set
-		    axis.axisTitle[showAxis ? 'show' : 'hide'](true);
+		    return dimensions;
 		};
 
 		/**
@@ -184,106 +200,172 @@
 		H.dateFormats = {
 		    // Week number
 		    W: function (timestamp) {
-		        var date = new this.Date(timestamp),
-		            day = this.get('Day', date) === 0 ? 7 : this.get('Day', date),
-		            time = date.getTime(),
-		            startOfYear = new Date(this.get('FullYear', date), 0, 1, -6),
-		            dayNumber;
-		        this.set('Date', date, this.get('Date', date) + 4 - day);
-		        dayNumber = Math.floor((time - startOfYear) / 86400000);
-		        return 1 + Math.floor(dayNumber / 7);
+		        var d = new Date(timestamp),
+		            yearStart,
+		            weekNo;
+		        d.setHours(0, 0, 0, 0);
+		        d.setDate(d.getDate() - (d.getDay() || 7));
+		        yearStart = new Date(d.getFullYear(), 0, 1);
+		        weekNo = Math.ceil((((d - yearStart) / 86400000) + 1) / 7);
+		        return weekNo;
 		    },
 		    // First letter of the day of the week, e.g. 'M' for 'Monday'.
 		    E: function (timestamp) {
-		        return this.dateFormat('%a', timestamp, true).charAt(0);
+		        return dateFormat('%a', timestamp, true).charAt(0);
 		    }
 		};
 
 		/**
-		 * Prevents adding the last tick label if the axis is not a category axis.
-		 *
-		 * Since numeric labels are normally placed at starts and ends of a range of
-		 * value, and this module makes the label point at the value, an "extra" label
-		 * would appear.
-		 *
+		 * If chart is stockChart, always return 'left' to avoid labels being placed
+		 * inside chart. Stock charts place yAxis labels inside by default.
 		 * @param {function} proceed - the original function
+		 * @return {string} 'left' if stockChart, or auto calculated alignment
 		 */
-		wrap(Tick.prototype, 'addLabel', function (proceed) {
-		    var axis = this.axis,
-		        isCategoryAxis = axis.options.categories !== undefined,
-		        tickPositions = axis.tickPositions,
-		        lastTick = tickPositions[tickPositions.length - 1],
-		        isLastTick = this.pos !== lastTick;
-
-		    if (!axis.options.grid || isCategoryAxis || isLastTick) {
-		        proceed.apply(this);
+		wrap(Axis.prototype, 'autoLabelAlign', function (proceed) {
+		    var axis = this,
+		        retVal;
+		    if (axis.chart.isStock) {
+		        retVal = 'left';
+		    } else {
+		        retVal = proceed.apply(axis, argsToArray(arguments));
 		    }
+		    return retVal;
 		});
 
 		/**
-		 * Center tick labels vertically and horizontally between ticks
+		 * Center tick labels in cells.
 		 *
 		 * @param {function} proceed - the original function
 		 *
 		 * @return {object} object - an object containing x and y positions
-		 *                         for the tick
+		 *                           for the tick
 		 */
-		wrap(Tick.prototype, 'getLabelPosition', function (proceed, x, y, label) {
-		    var retVal = proceed.apply(this, Array.prototype.slice.call(arguments, 1)),
-		        axis = this.axis,
+		wrap(Tick.prototype, 'getLabelPosition', function (proceed, x, y, label, horiz,
+		            labelOpts, tickmarkOffset, index) {
+		    var tick = this,
+		        axis = tick.axis,
+		        reversed = axis.reversed,
+		        chart = axis.chart,
 		        options = axis.options,
-		        tickInterval = options.tickInterval || 1,
-		        newX,
-		        newPos,
-		        axisHeight,
-		        fontSize,
-		        labelMetrics,
-		        lblB,
-		        lblH,
-		        labelCenter;
-
-		    // Only center tick labels if axis has option grid: true
-		    if (options.grid) {
-		        fontSize = options.labels.style.fontSize;
-		        labelMetrics = axis.chart.renderer.fontMetrics(fontSize, label);
-		        lblB = labelMetrics.b;
-		        lblH = labelMetrics.h;
-
-		        if (axis.horiz && options.categories === undefined) {
-		            // Center x position
-		            axisHeight = axis.axisGroup.getBBox().height;
-		            newPos = this.pos + tickInterval / 2;
-		            retVal.x = axis.translate(newPos) + axis.left;
-		            labelCenter = (axisHeight / 2) + (lblH / 2) - Math.abs(lblH - lblB);
-
-		            // Center y position
-		            if (axis.side === axisSide.top) {
-		                retVal.y = y - labelCenter;
-		            } else {
-		                retVal.y = y + labelCenter;
-		            }
+		        gridOptions = (options && isObject(options.grid)) ? options.grid : {},
+		        align = labelOpts.align,
+		        // verticalAlign is currently not supported for axis.labels.
+		        verticalAlign = 'middle', // labelOpts.verticalAlign,
+		        side = axisSide[axis.side],
+		        tickPositions = axis.tickPositions,
+		        tickPos = tick.pos - tickmarkOffset,
+		        nextTickPos = (
+		            isNumber(tickPositions[index + 1]) ?
+		            tickPositions[index + 1] - tickmarkOffset :
+		            axis.max + tickmarkOffset
+		        ),
+		        tickSize = axis.tickSize('tick', true),
+		        tickWidth = isArray(tickSize) ? tickSize[0] : 0,
+		        crispCorr = tickSize && tickSize[1] / 2,
+		        labelHeight,
+		        lblMetrics,
+		        lines,
+		        result,
+		        bottom,
+		        top,
+		        left,
+		        right;
+
+		    // Only center tick labels in grid axes
+		    if (gridOptions.enabled === true) {
+		        /**
+		         * Calculate top and bottom positions of the cell.
+		         */
+		        if (side === 'top') {
+		            bottom = axis.top + axis.offset;
+		            top = bottom - tickWidth;
+		        } else if (side === 'bottom') {
+		            top = chart.chartHeight - axis.bottom + axis.offset;
+		            bottom = top + tickWidth;
 		        } else {
-		            // Center y position
-		            if (options.categories === undefined) {
-		                newPos = this.pos + (tickInterval / 2);
-		                retVal.y = axis.translate(newPos) + axis.top + (lblB / 2);
-		            }
+		            bottom = axis.top + axis.len - axis.translate(
+		                reversed ? nextTickPos : tickPos
+		            );
+		            top = axis.top + axis.len - axis.translate(
+		                reversed ? tickPos : nextTickPos
+		            );
+		        }
 
-		            // Center x position
-		            newX = (this.getLabelWidth() / 2) - (axis.maxLabelLength / 2);
-		            if (axis.side === axisSide.left) {
-		                retVal.x += newX;
-		            } else {
-		                retVal.x -= newX;
-		            }
+		        /**
+		         * Calculate left and right positions of the cell.
+		         */
+		        if (side === 'right') {
+		            left = chart.chartWidth - axis.right + axis.offset;
+		            right = left + tickWidth;
+		        } else if (side === 'left') {
+		            right = axis.left + axis.offset;
+		            left = right - tickWidth;
+		        } else {
+		            left = Math.round(axis.left + axis.translate(
+		                reversed ? nextTickPos : tickPos
+		            )) - crispCorr;
+		            right = Math.round(axis.left + axis.translate(
+		                reversed ? tickPos : nextTickPos
+		            )) - crispCorr;
+		        }
+
+		        tick.slotWidth = right - left;
+
+		        /**
+		         * Calculate the positioning of the label based on alignment.
+		         */
+		        result = {
+		            x: (
+		                align === 'left' ?
+		                left :
+		                align === 'right' ?
+		                right :
+		                left + ((right - left) / 2) // default to center
+		            ),
+		            y: (
+		                verticalAlign === 'top' ?
+		                top :
+		                verticalAlign === 'bottom' ?
+		                bottom :
+		                top + ((bottom - top) / 2) // default to middle
+		            )
+		        };
+
+		        lblMetrics = chart.renderer.fontMetrics(
+		            labelOpts.style.fontSize,
+		            label.element
+		        );
+		        labelHeight = label.getBBox().height;
+
+		        // Adjustment to y position to align the label correctly.
+		        // Would be better to have a setter or similar for this.
+		        if (!labelOpts.useHTML) {
+		            lines = Math.round(labelHeight / lblMetrics.h);
+		            result.y += (
+		                // Center the label
+		                // TODO: why does this actually center the label?
+		                ((lblMetrics.b - (lblMetrics.h - lblMetrics.f)) / 2) +
+		                // Adjust for height of additional lines.
+		                -(((lines - 1) * lblMetrics.h) / 2)
+		            );
+		        } else {
+		            result.y += (
+		                // Readjust yCorr in htmlUpdateTransform
+		                lblMetrics.b +
+		                // Adjust for height of html label
+		                -(labelHeight / 2)
+		            );
 		        }
+
+		        result.x += (axis.horiz && labelOpts.x || 0);
+		    } else {
+		        result = proceed.apply(tick, argsToArray(arguments));
 		    }
-		    return retVal;
+		    return result;
 		});
 
-
 		/**
-		 * Draw vertical ticks extra long to create cell floors and roofs.
+		 * Draw vertical axis ticks extra long to create cell floors and roofs.
 		 * Overrides the tickLength for vertical axes.
 		 *
 		 * @param {function} proceed - the original function
@@ -291,105 +373,400 @@
 		 */
 		wrap(Axis.prototype, 'tickSize', function (proceed) {
 		    var axis = this,
-		        retVal = proceed.apply(axis, Array.prototype.slice.call(arguments, 1)),
+		        dimensions = axis.maxLabelDimensions,
+		        options = axis.options,
+		        gridOptions = (options && isObject(options.grid)) ? options.grid : {},
+		        retVal = proceed.apply(axis, argsToArray(arguments)),
 		        labelPadding,
 		        distance;
 
-		    if (axis.options.grid && !axis.horiz) {
+		    if (gridOptions.enabled === true) {
 		        labelPadding = (Math.abs(axis.defaultLeftAxisOptions.labels.x) * 2);
-		        if (!axis.maxLabelLength) {
-		            axis.maxLabelLength = axis.getMaxLabelLength();
-		        }
-		        distance = axis.maxLabelLength + labelPadding;
+		        distance = labelPadding +
+		            (axis.horiz ? dimensions.height : dimensions.width);
 
-		        retVal[0] = distance;
+		        if (isArray(retVal)) {
+		            retVal[0] = distance;
+		        } else {
+		            retVal = [distance];
+		        }
 		    }
 		    return retVal;
 		});
 
+		wrap(Axis.prototype, 'getTitlePosition', function (proceed) {
+		    var axis = this,
+		        options = axis.options,
+		        gridOptions = (options && isObject(options.grid)) ? options.grid : {};
+
+		    if (gridOptions.enabled === true) {
+		        // compute anchor points for each of the title align options
+		        var title = axis.axisTitle,
+		            titleWidth = title && title.getBBox().width,
+		            horiz = axis.horiz,
+		            axisLeft = axis.left,
+		            axisTop = axis.top,
+		            axisWidth = axis.width,
+		            axisHeight = axis.height,
+		            axisTitleOptions = options.title,
+		            opposite = axis.opposite,
+		            offset = axis.offset,
+		            tickSize = axis.tickSize() || [0],
+		            xOption = axisTitleOptions.x || 0,
+		            yOption = axisTitleOptions.y || 0,
+		            titleMargin = pick(axisTitleOptions.margin, horiz ? 5 : 10),
+		            titleFontSize = axis.chart.renderer.fontMetrics(
+		                axisTitleOptions.style && axisTitleOptions.style.fontSize,
+		                title
+		            ).f,
+		            // TODO account for alignment
+		            // the position in the perpendicular direction of the axis
+		            offAxis = (horiz ? axisTop + axisHeight : axisLeft) +
+		                (horiz ? 1 : -1) * // horizontal axis reverses the margin
+		                (opposite ? -1 : 1) * // so does opposite axes
+		                (tickSize[0] / 2) +
+		                (axis.side === axisSide.bottom ? titleFontSize : 0);
+
+		        return {
+		            x: horiz ?
+		                axisLeft - titleWidth / 2 - titleMargin + xOption :
+		                offAxis + (opposite ? axisWidth : 0) + offset + xOption,
+		            y: horiz ?
+		                (
+		                    offAxis -
+		                    (opposite ? axisHeight : 0) +
+		                    (opposite ? titleFontSize : -titleFontSize) / 2 +
+		                    offset +
+		                    yOption
+		                ) :
+		                axisTop - titleMargin + yOption
+		        };
+		    }
+
+		    return proceed.apply(this, argsToArray(arguments));
+		});
+
 		/**
-		 * Disregards space required by axisTitle, by adding axisTitle to axisParent
-		 * instead of axisGroup, and disregarding margins and offsets related to
-		 * axisTitle.
-		 *
-		 * @param {function} proceed - the original function
+		 * Avoid altering tickInterval when reserving space.
 		 */
-		wrap(Axis.prototype, 'getOffset', function (proceed) {
+		wrap(Axis.prototype, 'unsquish', function (proceed) {
 		    var axis = this,
-		        axisOffset = axis.chart.axisOffset,
-		        side = axis.side,
-		        axisHeight,
-		        tickSize,
 		        options = axis.options,
-		        axisTitleOptions = options.title,
-		        addTitle = axisTitleOptions &&
-		                axisTitleOptions.text &&
-		                axisTitleOptions.enabled !== false;
+		        gridOptions = (options && isObject(options.grid)) ? options.grid : {};
 
-		    if (axis.options.grid && isObject(axis.options.title)) {
+		    if (gridOptions.enabled === true && this.categories) {
+		        return this.tickInterval;
+		    }
 
-		        tickSize = axis.tickSize('tick')[0];
-		        if (axisOffset[side] && tickSize) {
-		            axisHeight = axisOffset[side] + tickSize;
-		        }
+		    return proceed.apply(this, argsToArray(arguments));
+		});
 
-		        if (addTitle) {
-		            // Use the custom addTitle() to add it, while preventing making room
-		            // for it
-		            axis.addTitle();
-		        }
+		/**
+		 * Creates a left and right wall on horizontal axes:
+		 * - Places leftmost tick at the start of the axis, to create a left wall
+		 * - Ensures that the rightmost tick is at the end of the axis, to create a
+		 *    right wall.
+		 *
+		 * @param {function} proceed - the original function
+		 * @param {object} options - the pure axis options as input by the user
+		 */
+		H.addEvent(Axis, 'afterSetOptions', function (e) {
+		    var options = this.options,
+		        userOptions = e.userOptions,
+		        gridAxisOptions,
+		        gridOptions = (options && isObject(options.grid)) ? options.grid : {};
+
+		    if (gridOptions.enabled === true) {
+
+		        // Merge the user options into default grid axis options so that when a
+		        // user option is set, it takes presedence.
+		        gridAxisOptions = merge(true, {
+
+		            className: 'highcharts-grid-axis ' + (userOptions.className || ''),
+
+		            dateTimeLabelFormats: {
+		                hour: {
+		                    list: ['%H:%M', '%H']
+		                },
+		                day: {
+		                    list: ['%A, %e. %B', '%a, %e. %b', '%E']
+		                },
+		                week: {
+		                    list: ['Week %W', 'W%W']
+		                },
+		                month: {
+		                    list: ['%B', '%b', '%o']
+		                }
+		            },
 
-		        proceed.apply(axis, Array.prototype.slice.call(arguments, 1));
+		            grid: {
+		                borderWidth: 1
+		            },
 
-		        axisOffset[side] = pick(axisHeight, axisOffset[side]);
+		            labels: {
+		                padding: 2,
+		                style: {
+		                    fontSize: '13px'
+		                }
+		            },
+
+		            title: {
+		                text: null,
+		                reserveSpace: false,
+		                rotation: 0
+		            },
+
+		            // In a grid axis, only allow one unit of certain types, for example
+		            // we shouln't have one grid cell spanning two days.
+		            units: [[
+		                'millisecond', // unit name
+		                [1, 10, 100]
+		            ], [
+		                'second',
+		                [1, 10]
+		            ], [
+		                'minute',
+		                [1, 5, 15]
+		            ], [
+		                'hour',
+		                [1, 6]
+		            ], [
+		                'day',
+		                [1]
+		            ], [
+		                'week',
+		                [1]
+		            ], [
+		                'month',
+		                [1]
+		            ], [
+		                'year',
+		                null
+		            ]]
+		        }, userOptions);
+
+		        // X-axis specific options
+		        if (this.coll === 'xAxis') {
+
+		            // For linked axes, tickPixelInterval is used only if the
+		            // tickPositioner below doesn't run or returns undefined (like
+		            // multiple years)
+		            if (
+		                defined(userOptions.linkedTo) &&
+		                !defined(userOptions.tickPixelInterval)
+		            ) {
+		                gridAxisOptions.tickPixelInterval = 350;
+		            }
 
+		            // For the secondary grid axis, use the primary axis' tick intervals
+		            // and return ticks one level higher.
+		            if (
+		                // Check for tick pixel interval in options
+		                !defined(userOptions.tickPixelInterval) &&
+
+		                // Only for linked axes
+		                defined(userOptions.linkedTo) &&
+
+		                !defined(userOptions.tickPositioner) &&
+		                !defined(userOptions.tickInterval)
+		            ) {
+		                gridAxisOptions.tickPositioner = function (min, max) {
+
+		                    var parentInfo = (
+		                        this.linkedParent &&
+		                        this.linkedParent.tickPositions &&
+		                        this.linkedParent.tickPositions.info
+		                    );
+
+		                    if (parentInfo) {
+
+		                        var unitIdx,
+		                            count,
+		                            unitName,
+		                            i,
+		                            units = gridAxisOptions.units,
+		                            unitRange;
+
+		                        for (i = 0; i < units.length; i++) {
+		                            if (units[i][0] === parentInfo.unitName) {
+		                                unitIdx = i;
+		                                break;
+		                            }
+		                        }
+
+		                        // Spanning multiple years, go default
+		                        if (!units[unitIdx][1]) {
+		                            return;
+		                        }
+
+		                        // Get the first allowed count on the next unit.
+		                        if (units[unitIdx + 1]) {
+		                            unitName = units[unitIdx + 1][0];
+		                            count = (units[unitIdx + 1][1] || [1])[0];
+		                        }
+
+		                        unitRange = H.timeUnits[unitName];
+		                        this.tickInterval = unitRange * count;
+		                        return this.getTimeTicks(
+		                            {
+		                                unitRange: unitRange,
+		                                count: count,
+		                                unitName: unitName
+		                            },
+		                            min,
+		                            max,
+		                            this.options.startOfWeek
+		                        );
+		                    }
+		                };
+		            }
 
-		        // Put axis options back after original Axis.getOffset() has been called
-		        options.title = axisTitleOptions;
+		        }
+
+		        // Now merge the combined options into the axis options
+		        merge(true, this.options, gridAxisOptions);
+
+		        if (this.horiz) {
+		            /**              _________________________
+		             * Make this:    ___|_____|_____|_____|__|
+		             *               ^                     ^
+		             *               _________________________
+		             * Into this:    |_____|_____|_____|_____|
+		             *                  ^                 ^
+		             */
+		            options.minPadding = pick(userOptions.minPadding, 0);
+		            options.maxPadding = pick(userOptions.maxPadding, 0);
+		        }
+
+		        // If borderWidth is set, then use its value for tick and line width.
+		        if (isNumber(options.grid.borderWidth)) {
+		            options.tickWidth = options.lineWidth = gridOptions.borderWidth;
+		        }
 
-		    } else {
-		        proceed.apply(axis, Array.prototype.slice.call(arguments, 1));
 		    }
 		});
 
 		/**
-		 * Prevents rotation of labels when squished, as rotating them would not
-		 * help.
+		 * Ensures a left wall on horizontal axes with series inheriting from column.
+		 * ColumnSeries normally sets pointRange to null, resulting in Axis to select
+		 * other values for point ranges. This enforces the above Axis.setOptions()
+		 * override.
+		 *                  _________________________
+		 * Enforce this:    ___|_____|_____|_____|__|
+		 *                  ^
+		 *                  _________________________
+		 * To be this:      |_____|_____|_____|_____|
+		 *                  ^
 		 *
 		 * @param {function} proceed - the original function
+		 * @param {object} options - the pure axis options as input by the user
 		 */
-		wrap(Axis.prototype, 'renderUnsquish', function (proceed) {
-		    if (this.options.grid) {
-		        this.labelRotation = 0;
-		        this.options.labels.rotation = 0;
+		wrap(Axis.prototype, 'setAxisTranslation', function (proceed) {
+		    var axis = this,
+		        options = axis.options,
+		        gridOptions = (options && isObject(options.grid)) ? options.grid : {},
+		        tickInfo = this.tickPositions && this.tickPositions.info,
+		        userLabels = this.userOptions.labels || {};
+
+		    if (this.horiz) {
+		        if (gridOptions.enabled === true) {
+		            each(axis.series, function (series) {
+		                series.options.pointRange = 0;
+		            });
+		        }
+
+		        // Lower level time ticks, like hours or minutes, represent points in
+		        // time and not ranges. These should be aligned left in the grid cell
+		        // by default. The same applies to years of higher order.
+		        if (
+		            tickInfo &&
+		            (
+		                options.dateTimeLabelFormats[tickInfo.unitName]
+		                    .range === false ||
+		                tickInfo.count > 1 // years
+		            ) &&
+		            !defined(userLabels.align)
+		        ) {
+		            options.labels.align = 'left';
+
+		            if (!defined(userLabels.x)) {
+		                options.labels.x = 3;
+		            }
+		        }
 		    }
-		    proceed.apply(this);
+
+		    proceed.apply(axis, argsToArray(arguments));
 		});
 
+		// TODO: Does this function do what the drawing says? Seems to affect ticks and
+		//       not the labels directly?
 		/**
-		 * Places leftmost tick at the start of the axis, to create a left wall.
-		 *
+		 * Makes tick labels which are usually ignored in a linked axis displayed if
+		 * they are within range of linkedParent.min.
+		 *                        _____________________________
+		 *                        |   |       |       |       |
+		 * Make this:             |   |   2   |   3   |   4   |
+		 *                        |___|_______|_______|_______|
+		 *                          ^
+		 *                        _____________________________
+		 *                        |   |       |       |       |
+		 * Into this:             | 1 |   2   |   3   |   4   |
+		 *                        |___|_______|_______|_______|
+		 *                          ^
 		 * @param {function} proceed - the original function
 		 */
-		wrap(Axis.prototype, 'setOptions', function (proceed, userOptions) {
-		    var axis = this;
-		    if (userOptions.grid && axis.horiz) {
-		        userOptions.startOnTick = true;
-		        userOptions.minPadding = 0;
-		        userOptions.endOnTick = true;
+		wrap(Axis.prototype, 'trimTicks', function (proceed) {
+		    var axis = this,
+		        options = axis.options,
+		        gridOptions = (options && isObject(options.grid)) ? options.grid : {},
+		        categoryAxis = axis.categories,
+		        tickPositions = axis.tickPositions,
+		        firstPos = tickPositions[0],
+		        lastPos = tickPositions[tickPositions.length - 1],
+		        linkedMin = axis.linkedParent && axis.linkedParent.min,
+		        linkedMax = axis.linkedParent && axis.linkedParent.max,
+		        min = linkedMin || axis.min,
+		        max = linkedMax || axis.max,
+		        tickInterval = axis.tickInterval,
+		        moreThanMin = firstPos > min,
+		        lessThanMax = lastPos < max,
+		        endMoreThanMin = firstPos < min && firstPos + tickInterval > min,
+		        startLessThanMax = lastPos > max && lastPos - tickInterval < max;
+
+		    if (
+		        gridOptions.enabled === true &&
+		        !categoryAxis &&
+		        (axis.horiz || axis.isLinked)
+		    ) {
+		        if ((moreThanMin || endMoreThanMin) && !options.startOnTick) {
+		            tickPositions[0] = min;
+		        }
+
+		        if ((lessThanMax || startLessThanMax) && !options.endOnTick) {
+		            tickPositions[tickPositions.length - 1] = max;
+		        }
 		    }
-		    proceed.apply(this, Array.prototype.slice.call(arguments, 1));
+
+		    proceed.apply(axis, argsToArray(arguments));
 		});
 
 		/**
-		 * Draw an extra line on the far side of the the axisLine,
-		 * creating cell roofs of a grid.
+		 * Draw an extra line on the far side of the outermost axis,
+		 * creating floor/roof/wall of a grid. And some padding.
+		 *
+		 * Make this:
+		 *             (axis.min) __________________________ (axis.max)
+		 *                           |    |    |    |    |
+		 * Into this:
+		 *             (axis.min) __________________________ (axis.max)
+		 *                        ___|____|____|____|____|__
 		 *
 		 * @param {function} proceed - the original function
 		 */
 		wrap(Axis.prototype, 'render', function (proceed) {
 		    var axis = this,
 		        options = axis.options,
+		        gridOptions = (options && isObject(options.grid)) ? options.grid : {},
 		        labelPadding,
 		        distance,
 		        lineWidth,
@@ -399,14 +776,21 @@
 		        xStartIndex,
 		        xEndIndex,
 		        renderer = axis.chart.renderer,
+		        horiz = axis.horiz,
 		        axisGroupBox;
 
-		    if (options.grid) {
+		    if (gridOptions.enabled === true) {
+		        // TODO acutual label padding (top, bottom, left, right)
+		        // Label padding is needed to figure out where to draw the outer line.
 		        labelPadding = (Math.abs(axis.defaultLeftAxisOptions.labels.x) * 2);
-		        distance = axis.maxLabelLength + labelPadding;
+		        axis.maxLabelDimensions = axis.getMaxLabelDimensions(
+		            axis.ticks,
+		            axis.tickPositions
+		        );
+		        distance = axis.maxLabelDimensions.width + labelPadding;
 		        lineWidth = options.lineWidth;
 
-		        // Remove right wall before rendering
+		        // Remove right wall before rendering if updating
 		        if (axis.rightWall) {
 		            axis.rightWall.destroy();
 		        }
@@ -417,27 +801,17 @@
 
 		        axisGroupBox = axis.axisGroup.getBBox();
 
-		        // Add right wall on horizontal axes
-		        if (axis.horiz) {
-		            axis.rightWall = renderer.path([
-		                'M',
-		                axisGroupBox.x + axis.width + 1, // account for left wall
-		                axisGroupBox.y,
-		                'L',
-		                axisGroupBox.x + axis.width + 1, // account for left wall
-		                axisGroupBox.y + axisGroupBox.height
-		            ])
-		            .attr({
-		                stroke: options.tickColor || '#ccd6eb',
-		                'stroke-width': options.tickWidth || 1,
-		                zIndex: 7,
-		                class: 'grid-wall'
-		            })
-		            .add(axis.axisGroup);
-		        }
-
+		        /*
+		         * Draw an extra axis line on outer axes
+		         *             >
+		         * Make this:    |______|______|______|___
+		         *
+		         *             > _________________________
+		         * Into this:    |______|______|______|__|
+		         *
+		         */
 		        if (axis.isOuterAxis() && axis.axisLine) {
-		            if (axis.horiz) {
+		            if (horiz) {
 		                // -1 to avoid adding distance each time the chart updates
 		                distance = axisGroupBox.height - 1;
 		            }
@@ -455,7 +829,7 @@
 		                }
 
 		                // If axis is horizontal, reposition line path vertically
-		                if (axis.horiz) {
+		                if (horiz) {
 		                    linePath[yStartIndex] = linePath[yStartIndex] + distance;
 		                    linePath[yEndIndex] = linePath[yEndIndex] + distance;
 		                } else {
@@ -467,10 +841,10 @@
 		                if (!axis.axisLineExtra) {
 		                    axis.axisLineExtra = renderer.path(linePath)
 		                        .attr({
-		                            stroke: options.lineColor,
-		                            'stroke-width': lineWidth,
+                            
 		                            zIndex: 7
 		                        })
+		                        .addClass('highcharts-axis-line')
 		                        .add(axis.axisGroup);
 		                } else {
 		                    axis.axisLineExtra.animate({
@@ -482,62 +856,130 @@
 		                axis.axisLine[axis.showAxis ? 'show' : 'hide'](true);
 		            }
 		        }
+
 		    } else {
 		        proceed.apply(axis);
 		    }
 		});
 
 		/**
-		 * Wraps chart rendering with the following customizations:
-		 * 1. Prohibit timespans of multitudes of a time unit
-		 * 2. Draw cell walls on vertical axes
+		 * Wraps axis init to draw cell walls on vertical axes.
 		 *
 		 * @param {function} proceed - the original function
 		 */
-		wrap(Chart.prototype, 'render', function (proceed) {
-		    // 25 is optimal height for default fontSize (11px)
-		    // 25 / 11 ≈ 2.28
-		    var fontSizeToCellHeightRatio = 25 / 11,
-		        fontMetrics,
-		        fontSize;
-
-		    each(this.axes, function (axis) {
-		        var options = axis.options;
-		        if (options.grid) {
-		            fontSize = options.labels.style.fontSize;
+		wrap(Axis.prototype, 'init', function (proceed, chart, userOptions) {
+		    var axis = this,
+		        gridOptions = (
+		            (userOptions && isObject(userOptions.grid)) ?
+		            userOptions.grid :
+		            {}
+		        ),
+		        columnOptions,
+		        column,
+		        columnIndex,
+		        i;
+		    function applyGridOptions(axis) {
+		        var options = axis.options,
+		            // TODO: Consider using cell margins defined in % of font size?
+		            // 25 is optimal height for default fontSize (11px)
+		            // 25 / 11 ≈ 2.28
+		            fontSizeToCellHeightRatio = 25 / 11,
+		            fontSize = options.labels.style.fontSize,
 		            fontMetrics = axis.chart.renderer.fontMetrics(fontSize);
 
-		            // Prohibit timespans of multitudes of a time unit,
-		            // e.g. two days, three weeks, etc.
-		            if (options.type === 'datetime') {
-		                options.units = [
-		                    ['millisecond', [1]],
-		                    ['second', [1]],
-		                    ['minute', [1]],
-		                    ['hour', [1]],
-		                    ['day', [1]],
-		                    ['week', [1]],
-		                    ['month', [1]],
-		                    ['year', null]
-		                ];
-		            }
+		        // Center-align by default
+		        if (!options.labels) {
+		            options.labels = {};
+		        }
+		        options.labels.align = pick(options.labels.align, 'center');
+
+		        // TODO: Check against tickLabelPlacement between/on etc
+		        /**
+		         * Prevents adding the last tick label if the axis is not a category
+		         * axis.
+		         *
+		         * Since numeric labels are normally placed at starts and ends of a
+		         * range of value, and this module makes the label point at the value,
+		         * an "extra" label would appear.
+		         */
+		        if (!axis.categories) {
+		            options.showLastLabel = false;
+		        }
 
-		            // Make tick marks taller, creating cell walls of a grid.
-		            // Use cellHeight axis option if set
-		            if (axis.horiz) {
-		                options.tickLength = options.cellHeight ||
-		                        fontMetrics.h * fontSizeToCellHeightRatio;
-		            } else {
-		                options.tickWidth = 1;
-		                if (!options.lineWidth) {
-		                    options.lineWidth = 1;
-		                }
-		            }
+		        /**
+		         * Make tick marks taller, creating cell walls of a grid.
+		         * Use cellHeight axis option if set
+		         */
+		        if (axis.horiz) {
+		            options.tickLength = gridOptions.cellHeight ||
+		                    fontMetrics.h * fontSizeToCellHeightRatio;
 		        }
-		    });
 
-		    // Call original Chart.render()
-		    proceed.apply(this);
+		        /**
+		         * Prevents rotation of labels when squished, as rotating them would not
+		         * help.
+		         */
+		        axis.labelRotation = 0;
+		        options.labels.rotation = 0;
+		    }
+
+		    if (gridOptions.enabled) {
+		        if (defined(gridOptions.borderColor)) {
+		            userOptions.tickColor =
+		                userOptions.lineColor = gridOptions.borderColor;
+		        }
+
+		        // Handle columns, each column is a grid axis
+		        if (isArray(gridOptions.columns)) {
+		            columnIndex = 0;
+		            i = gridOptions.columns.length;
+		            while (i--) {
+		                columnOptions = merge(
+		                    userOptions,
+		                    gridOptions.columns[i],
+		                    {
+		                        // Force to behave like category axis
+		                        type: 'category'
+		                    }
+		                );
+
+		                delete columnOptions.grid.columns; // Prevent recursion
+
+		                column = new Axis(chart, columnOptions);
+		                column.isColumn = true;
+		                column.columnIndex = columnIndex;
+
+		                wrap(column, 'labelFormatter', function (proceed) {
+		                    var axis = this.axis,
+		                        tickPos = axis.tickPositions,
+		                        value = this.value,
+		                        series = axis.series[0],
+		                        isFirst = value === tickPos[0],
+		                        isLast = value === tickPos[tickPos.length - 1],
+		                        point = H.find(series.options.data, function (p) {
+		                            return p[axis.isXAxis ? 'x' : 'y'] === value;
+		                        });
+
+		                    // Make additional properties available for the formatter
+		                    this.isFirst = isFirst;
+		                    this.isLast = isLast;
+		                    this.point = point;
+
+		                    // Call original labelFormatter
+		                    return proceed.call(this);
+		                });
+
+		                columnIndex++;
+		            }
+		        } else {
+		            // Call original Axis.init()
+		            proceed.apply(axis, argsToArray(arguments));
+		            applyGridOptions(axis);
+		        }
+		    } else {
+		        // Call original Axis.init()
+		        proceed.apply(axis, argsToArray(arguments));
+		    }
 		});
 
 	}(Highcharts));