* MIT-licensed (http://opensource.org/licenses/MIT)
*/
+/*global Dygraph:false */
+
Dygraph.Plugins.Axes = (function() {
"use strict";
axes.prototype.layout = function(e) {
var g = e.dygraph;
- if (g.getOption('drawYAxis')) {
+ if (g.getOptionForAxis('drawAxis', 'y')) {
var w = g.getOption('yAxisLabelWidth') + 2 * g.getOption('axisTickSize');
- var y_axis_rect = e.reserveSpaceLeft(w);
+ e.reserveSpaceLeft(w);
}
- if (g.getOption('drawXAxis')) {
+ if (g.getOptionForAxis('drawAxis', 'x')) {
var h;
// NOTE: I think this is probably broken now, since g.getOption() now
// hits the dictionary. (That is, g.getOption('xAxisHeight') now always
} else {
h = g.getOptionForAxis('axisLabelFontSize', 'x') + 2 * g.getOption('axisTickSize');
}
- var x_axis_rect = e.reserveSpaceBottom(h);
+ e.reserveSpaceBottom(h);
}
if (g.numAxes() == 2) {
- // TODO(danvk): per-axis setting.
- var w = g.getOption('yAxisLabelWidth') + 2 * g.getOption('axisTickSize');
- var y2_axis_rect = e.reserveSpaceRight(w);
+ // TODO(danvk): introduce a 'drawAxis' per-axis property.
+ if (g.getOptionForAxis('drawAxis', 'y')) {
+ // TODO(danvk): per-axis setting.
+ var w = g.getOption('yAxisLabelWidth') + 2 * g.getOption('axisTickSize');
+ e.reserveSpaceRight(w);
+ }
} else if (g.numAxes() > 2) {
g.error("Only two y-axes are supported at this time. (Trying " +
"to use " + g.numAxes() + ")");
};
axes.prototype.clearChart = function(e) {
- var g = e.dygraph;
this.detachLabels();
};
axes.prototype.willDrawChart = function(e) {
var g = e.dygraph;
- if (!g.getOption('drawXAxis') && !g.getOption('drawYAxis')) return;
+
+ if (!g.getOptionForAxis('drawAxis', 'x') && !g.getOptionForAxis('drawAxis', 'y')) return;
// Round pixels to half-integer boundaries for crisper drawing.
function halfUp(x) { return Math.round(x) + 0.5; }
lineHeight: "normal", // Something other than "normal" line-height screws up label positioning.
overflow: "hidden"
};
- }
+ };
var labelStyles = {
x : makeLabelStyle('x'),
y : makeLabelStyle('y'),
- y2 : makeLabelStyle('y2'),
+ y2 : makeLabelStyle('y2')
};
var makeDiv = function(txt, axis, prec_axis) {
var layout = g.layout_;
var area = e.dygraph.plotter_.area;
- if (g.getOption('drawYAxis')) {
+ if (g.getOptionForAxis('drawAxis', 'y')) {
if (layout.yticks && layout.yticks.length > 0) {
var num_axes = g.numAxes();
for (i = 0; i < layout.yticks.length; i++) {
var axisX;
if (g.getOption('drawAxesAtZero')) {
var r = g.toPercentXCoord(0);
- if (r > 1 || r < 0) r = 0;
+ if (r > 1 || r < 0 || isNaN(r)) r = 0;
axisX = halfUp(area.x + r * area.w);
} else {
axisX = halfUp(area.x);
}
}
- if (g.getOption('drawXAxis')) {
+ if (g.getOptionForAxis('drawAxis', 'x')) {
if (layout.xticks) {
for (i = 0; i < layout.xticks.length; i++) {
tick = layout.xticks[i];